Merge branch 'release/1.5' into develop
Merge branch 'hotfix/1.5.1' into develop
Merge branch 'hotfix/1.5.2' into develop
Merge branch 'hotfix/1.5.3' into develop
Merge branch 'master' of https://github.com/openjaf/moremex into develop
reverting merge with master
Moving _inputs.html.erb into index.html.erb, on flights and hotels.
designing _inputs.html.erb for home/index.html.erb
designing hotels/_inputs.html.erb for home/index.html.erb
implementing tab on #main-navigation
Merge branch 'feature/improving_design' into develop
adapting to heroku
removing proxy
Merge branch 'release/1.6'
fixing spelling.
Merge branch 'hotfix/1.6.1'