Merge pull request #32 from jakecadams/viewpins

Adds pins from DB within bounds of map
Fix for empty location on $stateParams
getLocation timeout fix
Merge branch 'master' of https://github.com/jakecadams/freshly

Conflicts:
	www/app/controllers_views/capture/capture.js