+ Corrected label for edit button in project members view ("edit file" -> "edit user")

+ Changed permission for adding users to an existing project from "administration" to "project edit"
remove force compile
bug where user can't have different locale than system

by forcing recompile of the config each time...
this feature will be gone in time.
first implementation of AES file encryption
more aes work
more aes work
more aes work
Merge branch 'master' of git://github.com/philippK-de/Collabtive
Merge branch 'master' of https://github.com/philippK-de/Collabtive

Conflicts:
	changelog.txt
Improved translation: Norwegian (Nynorsk)
Update lng.conf
Update lng.conf
fix possible sql vulnerability

missing typecast to int added
changelog
actually enable html purifier
beautify
more purififer
remove strip only tags
remove cache files
smarty3 fix