Squashed commit of the following:

commit 061ff8bfa1f670c36142bd41d37f4fbc6edf6df2
Merge: f8412a4 39ffc3c
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 31 12:50:16 2013 +0200

    Merge branch 'private-master' into merge

    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

commit 39ffc3c550496091aa511bc189b56f93ee7a0872
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 31 12:46:46 2013 +0200

    more changes

commit 5fd3f431614192499139a22d9f9ab54dec66632f
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 31 12:13:04 2013 +0200

    changes

commit 38a36cec68cbfe59fa013ad25caa8a1847fdba3c
Merge: 1526433 9094158
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 31 11:08:40 2013 +0200

    Merge branch 'refs/heads/merge' into private-master

commit 9094158195a4967c66f2ae713f22c339ed4def00
Merge: f3b749e 3d59948
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 31 11:08:25 2013 +0200

    Merge branch 'refs/heads/master' into merge

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

    update from pri

commit 152643342f55099adeb322c2872efdb511a03ab2
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 31 00:28:43 2013 +0200

    sttt

commit 987ec166e5d098e6b7f6a00573fcf8e6c950adde
Merge: ba72426 f922d91
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 30 19:29:37 2013 +0200

    Add 'thesub/' from commit 'f922d913f20e9cd430b1d58bfd4533511a94b014'

    git-subtree-dir: thesub
    git-subtree-mainline: ba7242650bbc3fbf206eae822ad3dfb76c9a4c18
    git-subtree-split: f922d913f20e9cd430b1d58bfd4533511a94b014

commit ba7242650bbc3fbf206eae822ad3dfb76c9a4c18
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 30 19:28:06 2013 +0200

    removing public subtree

commit f922d913f20e9cd430b1d58bfd4533511a94b014
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 30 10:22:59 2013 -0700

    Initial commit