language modification working
language conflicts resolved
trip page changes
added cookie insert and read for tour
changed opacity for homepage selections
functional gallery, extra options, h1 listing issues done
Changed modal position on trip page
extra options, funcational gallery, language maintain in session, h1 listing done
language maintain in session, functional gallery, extra options added, h1 content listing done
gemfile.lock
conflict resolved
conflict resolved
master merged
migration added
double to integer
Merge git.shellycloud.com:wantatrip

pull from server
.
Changes to: trip add page, removed german_city validation, changed minor design things, added sitemap file
removed country from validation
added ckeditor to population field, added population in show page
changed map view