Added news on main page
Added settings in categories
Merge branch 'master' of https://github.com/mysmartcity/flux