renewal email activation page
merge login form
Merge branch 'release/2014.09.23' of github.com:DonutWorks/Ari into release/2014.09.23