cp,,ot
Merge branch 'master' of https://github.com/jaimoto81/BQuest-chair.git

Conflicts:
	assets/www/js/iScroll.js
	assets/www/js/jquery.min.js
	assets/www/js/quick.js