?
Merge branch 'master' into chr

Conflicts:
	PostUpNow/about.html
	PostUpNow/index.html
	PostUpNow/postupnow.py
fixed pins
Merge branch 'master' into chr

Conflicts:
	PostUpNow/postupnow.pyc
Merge branch 'chr'