story factory for story mailer
Merge branch 'develop' into feature/factory_girl_migrate

* develop:
  views i18n
  i18n in layout
  web controllers parent fix
  web module
  haml layout
users tests without fixtures
comment factory
replacement of fixtures to factories
Merge branch 'feature/factory_girl_migrate' into develop

* feature/factory_girl_migrate:
  replacement of fixtures to factories
  comment factory
  users tests without fixtures
  story factory for story mailer