some updates
Merge branch 'dev' of git@github.com:danielkinjerski/GameJame2013_Sept.git into dev

Conflicts:
	GameJam/Assets/Prefabs/GameEntities/CD4_normal.prefab
	GameJam/Assets/Prefabs/GameEntities/Player.prefab