Merge branch 'chr'
bug fixes
same bug fixes
Merge branch 'master' into chr

Conflicts:
	PostUpNow/index.html
	PostUpNow/model.py
	PostUpNow/postupnow.py
bug fixes ... again