Merge remote-tracking branch 'origin/master'

Conflicts:
	v2.0/TemplateV3/src/fys/AppMan_NewAccount.form
	v2.0/TemplateV3/src/fys/AppMan_NewAccount.java