Mashup-View beta
Merge branch 'master' of https://github.com/pixelpark/ppnet

Conflicts:
	www/js/controller/view_controller.js