#Issue_00200: working on heroku deploy
Merge branch 'Issue_00200'

Conflicts:
	system.properties