Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/app.js
	framework/views/newtest.jade