FCTWO-232
Merge branch 'master' of https://github.com/pixelpark/ppnet

Conflicts:
	www/js/controller/posting_controller.js
FCTWO-232