css
Merge branch 'master' of https://github.com/mysmartcity/flux

Conflicts:
	client/app/main/main.html
update design
Merge branch 'master' of https://github.com/mysmartcity/flux