Merge branch 'release/0.0.1'

* release/0.0.1:
  add rails factor
  fix tests
  add language support
  fix forms
  add some design
  add yeti bootswatch
  replace erb to haml
  add tests
  fix functional
  basic functional
  replace sqlite to pg
  clear readme
change ruby version
change ruby version
Merge branch 'master' of github.com:kalashnikovisme/kabal_site

* 'master' of github.com:kalashnikovisme/kabal_site:
  change ruby version

Conflicts:
	Gemfile
Merge branch 'release/0.0.2'

* release/0.0.2:
  fix heroku
Merge branch 'release/0.0.3'

* release/0.0.3:
  add ruby version

Conflicts:
	Gemfile
Merge branch 'release/0.0.4'

* release/0.0.4:
  update GEmfile lock
  links removed
Merge branch 'release/0.1.0'

* release/0.1.0:
  edit arch
  add decorators
  add some logics
  fix languages translations
  add Gemfile.lock to gitignore
  remove Gemfile.lock
  add comment
  add react
  add locals for languages
restore Gemfile
Merge branch 'hotfix/restore_Gemfilelock' into develop

* hotfix/restore_Gemfilelock:
  restore Gemfile
  change ruby version
  change ruby version