Tom's latest version
Changes in interfaces to run with nutella 0.2.x
Merge branch 'master' into prod

Conflicts:
	interfaces/rq-seismograph/index.html
	interfaces/rq-web-admin/index.html