my stuff
Merge branch 'master' of https://github.com/ganddev/devfest2014
Bjoerns stuff