Move Resources folder
Merge branch 'master' into noko-develop

Conflicts:
	Vazion.xcodeproj/project.pbxproj