10.08
Merge branch 'master' of https://github.com/linuxwit/onesale

Conflicts:
	app/index.html
	app/scripts/main.js
	app/scripts/routes.js