working on uploading to artifactory
Merge branch 'master' into loanprogramredesign

Conflicts:
	build.gradle