fix some overwritten stuff, user_comments still need some love
Merge branch 'master' of github.com:schlubbi/IMI-Maps