ajax calls
Merge branch 'master' of github.com:raulgarreta/crunchy

Conflicts:
	app/www/index.html