Merge pull request #1 from vakhalin/dev

merge done
Merge pull request #2 from vakhalin/dev

Dev
Merge pull request #3 from vakhalin/dev

Dev
Merge branch 'dev'
Add precompiled assets for Heroku
Add  Heroku
Add  Gemfile.lock