grunt build replaces the url of the dist version to point to live api. when run from app directory, the dev api is used.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js
	dist/index.html
	package.json