Enable query string variable substitution
Merge branch 'master' into 74-query-subs

Conflicts:
	app.js
Merge pull request #81 from andylolz/74-query-subs

Enable query string variable substitution