fix testing error that causes system to break.
Merge pull request #124 from kmeurer/proximityapi

fix testing error that causes system to break.
Comments out failing test for now, starts editing ionicons for dash view
Uncomments priyas tests, comments Kevin's tests
Staging commits for rebase pull from kevin
Staged one more commit
Update proximity.spec.js
Merge pull request #121 from jamesongamble/master

Comments out failing test for now, starts editing ionicons for dash view
minor changes
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	specs/server/proximity.spec.js