Merge branch 'master' of https://github.com/abukurov/droid-ui into featu...

...res/load-widgets-from-server

Conflicts:
	public/sass/styles.scss
	server/views/index.jade