fixed conflicts
Merge branch 'master' of github.com:mansoorelahi/aidhen into shwetha
Merge pull request #7 from mansoorelahi/shwetha

added active admin
added terms and conditions page
Merge pull request #6 from mansoorelahi/Ruk

added the footer links
make the active adminwork
Added responsive for terms and privacy pages
static pages newly added
Merge pull request #9 from mansoorelahi/Ruk

Added responsive for terms and privacy pages
ruk changes
resolve the navigatiob branch conflicts
Merge pull request #10 from mansoorelahi/navigation

static pages newly added
Devise login added
removed unwanted file
added gemfile and removed temp files
added facebook login and registration
removed unwanted javascripts and temp layout
removed temp application layout
Merge pull request #11 from mansoorelahi/Ruk

Devise login added and removed unwanted file
add the necessary indexing for adventures table