merge from Issue_001000
preparing heroku deploy
Merge branch 'Issue_00200'

Conflicts:
	system.properties
Merge branch 'Issue_00200'

Conflicts:
	pom.xml
	procfile
testing procfile
Procfile capitalized
configuring DB to deploy into heroku
#Issue_00200: configuring local DB