button green in page 'request reset password'
Merge branch 'reset_password' into nightly
button green in page 'change password'
Merge branch 'change_password' into nightly

Conflicts:
	controllers/default.py
Merge branch 'nightly' of github.com:kolaborativa/redekolaborativa into nightly