ready for dist
bumped version number
Merge branch 'release/v1.1' into dev
fixed jshint errors so grunt would stfu
reset ajax calls to 0.0.0.0:5000
Merge branch 'dev' into feature/manage

Conflicts:
	app/scripts/controllers.js