button
Merge branch 'master' of https://github.com/887/RavenCrypt

Conflicts:
	client/www/templates/register/confirm.html