Begin develop form wizard
Merge commit '2082413'

Conflicts:
	JimboFormPlugin.php
	templates/jforms/input_email.php