installation easy script commit
Merge branch 'master' of https://github.com/VekiaOpenSource/heimdall
Merge settings default to easy install
Conflicts:
	server/server/settings.py