AlleMeineEntchen
Merge branch 'master' of git://github.com/githubteacher/wjax2013

Merge
Merge branch 'master' of https://github.com/githubteacher/wjax2013

Merge