Local changes
Merge branch 'master' of https://github.com/jobrun/jobrun

Conflicts:
	webapp.py
updates before merge
Merge branch 'master' of https://github.com/jobrun/jobrun

Conflicts:
	webapp.py