Globaal de bestanden  en de database voorbereiden
Merge branch 'master' of github.com:edge-art/dopefreegame

Conflicts:
	app/config/database.php
Merge branch 'master' of github.com:edge-art/dopefreegame into development