Merge branch 'master' of https://github.com/giacogiac/ducking-bear

Conflicts:
	Database/Database.dbmdl
	ducking-bear.suo