Ready for merge.
Search by Proximity fully functional.
Merge branch 'master' into cole

Conflicts:
	app/views/Users/create-edit.blade.php
	app/views/Users/index.blade.php
	app/views/Users/show.blade.php
Merge pull request #55 from areveal/cole

Cole