min ch
mcMerge branch 'master' of https://github.com/amolc/gigstergo

Conflicts:
	mobile/www/js/controllers.js