ticket expired support.
Merge branch 'develop' of https://github.com/DonutWorks/Ari into HEAD

Conflicts:
	app/services/user_activator.rb
	spec/unit/services/user_activator_spec.rb
Merge pull request #234 from DonutWorks/bug/issue-199

Bug/issue 199