progress 3.6.1
progress 3.6.2
Progress 3.6.3
Updated
Merge branch 'heroku'

Conflicts:
	.gitignore
	logfile