Skelet
Database created
Merge branch 'develop'

Conflicts:
	Server/database