Trip contoller adjustments
Merge branch 'master' of github.com:TeamGlorious/explorify

Resolve recursive merge
populate trips#index with random thumbnails
Remove location bool from media
33 instagram photo algorithm fix.  Make media edit page.
Merge branch 'master' of github.com:TeamGlorious/explorify

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

recursive merge conflict
change media column long to lng
Merge branch 'dev'

recursive merge conflict
Merge pull request #19 from MooreJesseB/master

Lotsa stuff.
Added image capabilities to marker info window
Merge branch 'master' of git://github.com/TeamGlorious/explorify

Conflicts:
	Gemfile
	Gemfile.lock
Jesse's Merge
Merge pull request #20 from SalamanderMike/master

Added pictures capability to markers' info window
my updates
Merge branch 'master' of git://github.com/TeamGlorious/explorify into WIP
Merge pull request #21 from sbokaie/WIP

Wip
minor tweaks after addition of new styles
Shawn css changes
Merge pull request #22 from MooreJesseB/master

minor tweaks after addition of new styles