Initial commit
Merge branch 'master' into beta

Conflicts:
	.gitignore