Merge remote-tracking branch 'remotes/hotfix/master'

Conflicts:
	README.md
	RMP/Config/Account/AccountService.xml
50001
Merge remote-tracking branch 'remotes/hotfix/master'

Conflicts:
	RMP/Config/Account/AccountService.xml
dfgdfg
Merge branch 'master' of github.com:rfahey/client