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

Conflicts:
	public/sass/styles.scss
Merge pull request #16 from abukurov/features/add-layout

Fix bugs