Making the two highlighting pages play nicely in pinch.js
Merge branch 'master' of github.com:pinch-tn/pinch-app

Conflicts:
	pinch/static/js/pinch.js