refactored
added translation
added weekly mailer
improvements
fixed bug
Merge branch 'develop'

* develop:
  fixed bug
  improvements
  added weekly mailer
  added translation
  refactored

Conflicts:
	Gemfile.lock