Merge pull request #134 from jtwigg/develop

Develop
Fixes #131
Updates Cocos2d
Updates Cocos2d
Merge pull request #141 from jtwigg/develop

read from the correct position type in property setter.
Updates Cocos2d
Lock audio preview to the top and resize properly.