pricing changes
Merge branch 'master' of https://github.com/sagittaros/drawingboard-www

Conflicts:
	js/vendor.js
conflicted vendor.js