initial files on server
setup for server
Merge branch 'master' into develop

Conflicts:
	.gitignore