Search for location works
Merge pull request #17 from SalamanderMike/master

Search for location works
I merged this because I only touched my own javascript in one file
Added click info to markers
Merge pull request #18 from SalamanderMike/master

Added click info to markers
I merged this because I only effected my js file and no others
Merge branch 'master' of github.com:TeamGlorious/explorify

Recursive merge fix
remove datepicker files.  Library was unnecessary
Merge branch 'dev'

recursive merge conflict