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
..
2015-01-02 15:12:08 +01:00
2014-12-28 20:54:42 +01:00
2014-12-31 18:07:27 +01:00
2015-01-02 15:12:08 +01:00
2014-10-26 21:04:08 +03:00
2015-01-02 15:12:08 +01:00
2015-01-02 15:12:08 +01:00
2014-12-31 18:07:27 +01:00
2014-12-31 10:53:00 +01:00
2014-12-31 18:14:16 +01:00
2014-12-31 18:14:16 +01:00
2014-12-31 10:53:00 +01:00