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

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

Conflicts:
	client/app/main/main.html
update new-articol&header
Merge branch 'master' of https://github.com/mysmartcity/flux
Merge branch 'master' of https://github.com/mysmartcity/flux