adding camera controls
add mask
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git into ryan
add update camera function
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git into ryan

Conflicts:
	src/ata/GameLogic.as
refactor to x and y
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git into ryan

Conflicts:
	src/ata/Entity.as
smooth camera
Merge branch 'ryan'