Fixed incorrect strings
gitignore
Merge branch 'master' of https://github.com/jurrehart/Collabtive
Merge branch 'master' of https://github.com/philippk-de/Collabtive