Changes made by Sebastian Jordan (sjordan@r2logic.com).
Merge branch 'master' of https://github.com/SebastianSunSun/gps.git

Conflicts:
	gps/js/controllers.js