commit
Merge branch 'master' of https://github.com/alarinel/kingMaker.git

Conflicts:
	KingMaker/kingMaker.db