refining stuff
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned
refactored new objects lua and levels lua
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned

Conflicts:
	CocoonedTiled/animation.lua
	CocoonedTiled/loadLevel.lua
	CocoonedTiled/mapdata/art/.DS_Store
	CocoonedTiled/objects.lua
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned