refactored ui in google format
Merge branch 'master' into new-design

Conflicts:
	bower.json
	client/app/main/main.html
	client/index.html
bugfix: bower.json comma and updated main
more refactoring
fix conflict with main.html, css, bower.json
Merge branch 'new-design'

Conflicts:
	client/app/main/main.html
restored correct fetch function call from button