enable and configure password-change plugin for roundcube
Merge branch 'master' of https://github.com/randallsquared/mailinabox

Conflicts:
	scripts/webmail.sh