Merge pull request #37 from janthurau/master

Adds support for user groups
Merge branch 'pr/2'

Conflicts:
	app/models/digest_mailer.rb