rolling back all bad changes again;)
Merge branch 'master' of https://github.com/eMaerthin/pamsi2014
...