layouting
Merge branch 'master' of github.com:hack4future/safecity