Improve test framework.
Merge branch 'master' into 137

Conflicts:
	client/demo/client/scripts/negawatt/controllers/access.js
	client/demo/client/views/pages/signin.html
	negawatt/modules/custom/negawatt_restful/negawatt_restful.module