Merge pull request #9 from SalamanderMike/master

Fixed map bug
Navbar with routes
Merge pull request #10 from SalamanderMike/master

Moved explorify to trips
Merge pull request #11 from sbokaie/master

Navbar with routes
allow date ranges above seven days
Merge branch 'master' of github.com:TeamGlorious/explorify

Merge Conflict resolved - Recursive strategey
Merge pull request #12 from MooreJesseB/master

Model tweaks to Media - Now allows date ranges above 7 days
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Merge Jesse and Shawn
Added group merge