prepare for refactor/rename
merge
Merge branch 'master' of https://github.com/broding/ggj2014_flixel
merge