Merge branch 'master' of https://github.com/brainysmith/idm-blitz

Conflicts:
	.idea/ant.xml