Initial import
Merge branch 'refs/heads/master' into vuforia

Conflicts:
	.gitignore