Merge branch 'master' of github.com:pbergman/KeePass

Conflicts:
	KeePass/Config/services.xml