using local proxy in development (XHR issue)

corsproxy
Merge branch 'master' of https://github.com/Betahackers/quito-frontend

Conflicts:
	app/scripts/utils.js