Squashed commit of the following:

commit f3b749e8b2f4946cbc6341f3f65905a86eeb9aad
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 31 11:07:56 2013 +0200

    update from pri