Initial commit
Merge remote-tracking branch 'origin/master' into oneserver

Conflicts:
	.gitignore