Resolution bug layers
Merge branch 'master' of https://github.com/Waidd/GGJ2014

Conflicts:
	ProjectSettings/TagManager.asset