added configuration file
Merge remote-tracking branch 'origin/master'

Conflicts:
	Data/Database.ini
added configuration file