v0.21
Merge branch 'master' of https://github.com/rexam/master-blaster

Conflicts:
	classes/user.php
	login.php
	templates/loginForm.php
	templates/lostPassword.php