start fix translate in views
merge master with with_sqlite
locales, gitignore add gemfile
Merge branch 'master' of https://github.com/cronon/SmartReserve
merge with locales