#Issue_00200: heroky deploy
Merge branch 'Issue_00200'

Conflicts:
	pom.xml
	procfile