Merge branch 'master' of https://github.com/abukurov/droid-ui into features/load-widgets-from-server

Conflicts:
	public/sass/styles.scss
	server/views/index.jade
Merge pull request #11 from abukurov/features/load-widgets-from-server

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