commit deco6
Merge remote-tracking branch 'origin/master'

Conflicts:
	configuration.html
	requestAccount.html