colored pins
Merge branch 'master' into chr

Conflicts:
	PostUpNow/postupnow.pyc
labels on pins, colored pins
Merge branch 'master' into chr

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