update 20:14 15.4.2014
Merge branch 'master' of https://github.com/UrjalaCoder/codename-rain