quantity
Merge branch 'master' of https://github.com/jilse/451order
Merge branch 'master' of https://github.com/jilse/451order

Conflicts:
	app/js/directives.js
Merge branch 'master' of https://github.com/jilse/451order

Conflicts:
	app/js/directives.js
Merge branch 'master' of https://github.com/jilse/451order