Igor Zhukov 2dbffb6154 Merge branch 'pr/508'
Also improved styles for new material design

Conflicts:
	app/css/desktop.css
	app/partials/desktop/im.html
	app/vendor/jquery.emojiarea/jquery.emojiarea.js
2015-01-02 15:12:08 +01:00
..
2014-12-31 18:14:16 +01:00
2014-12-15 12:04:05 -08:00
2014-12-31 18:07:27 +01:00
2014-12-31 18:07:27 +01:00
2015-01-02 13:31:29 +01:00
2014-12-31 18:07:27 +01:00
2014-12-14 21:55:03 -08:00
2014-10-29 21:54:17 +03:00
2014-11-05 21:37:01 +03:00
2014-09-11 17:06:06 +04:00
2014-11-05 21:37:01 +03:00
2015-01-01 08:33:35 +01:00
2015-01-02 15:12:08 +01:00
2014-12-31 18:07:27 +01:00
2014-12-31 18:07:27 +01:00
2014-09-23 21:06:05 +04:00
2014-12-20 09:11:06 -08:00
2014-12-31 18:07:27 +01:00
2014-12-28 15:38:48 +01:00
2014-12-11 00:03:10 -08:00
2014-12-31 18:07:27 +01:00