Merge branch 'master' of https://bitbucket.org/magiclab/2016ggj

Conflicts:
	ProjectSettings/TagManager.asset
asda
