Merge branch 'release/0.7.1' into develop
Typo
Merge branch 'develop'
Emergency bugfix
Merge branch 'develop'
Merge branch 'release/0.9.0' into develop
Add cleanup to pretender server
Make it a quick fix
Merge branch 'develop'
Merge branch 'master' of https://github.com/jupl/brunch-toolchain into develop

Conflicts:
	README.md
	server/prerender/index.js
Merge branch 'develop'
Merge branch 'master' into cordova

Conflicts:
	server/prerender/index.coffee