Merge pull request #188 from Verkalets/dev

Dev
Update Gemfile
Merge pull request #206 from Verkalets/dev

Dev
Merge pull request #222 from Verkalets/dev

Dev
Merge pull request #224 from Verkalets/dev

Dev
Merge pull request #238 from Verkalets/dev

Dev
Merge pull request #246 from Verkalets/dev

Dev
Merge pull request #253 from Verkalets/dev

Dev
Merge pull request #275 from Verkalets/dev

Dev
Merge pull request #279 from Verkalets/dev

Dev
Merge pull request #298 from Verkalets/dev

Dev
Merge pull request #300 from Verkalets/dev

Dev
Merge pull request #302 from Verkalets/dev

Dev
Merge pull request #308 from Verkalets/dev

Dev
Merge pull request #309 from Verkalets/fix

add
new favicon, change text about hotel in homepage, goto top on hotel create
Merge pull request #310 from Verkalets/frontend290914

new favicon, change text about hotel in homepage, goto top on hotel crea...
fix description for city
add image for index and admin
fix redactor