Merge changes of branch 'svn-master'

Changes of the never released Achievo 1.4.6 developed by IBuildings (not to be confused with Achievo 1.4.6 as of November 2012 developed by the Achievo Community) were merged, too. Those changes are **HIGHLY SECURITY SENSITIVE**!

I've merged everything by cherry picking (```git cherry-pick -n [commit]```), thus reviewed all changes manually. Everything should be fine, ```svn-master``` isn't (logically) ahead anymore. Anyway, all changes need to be tested!