Fixes #1597: Added `enableAutoLogin` to basic and advanced application templates so "remember me" now works properly
fixed functional test when enablePrettyUrl is false.
Fixes #1643: Added default value for `Captcha::options`
Fixes #1604: fixed URL and cookie problems. Refactored tests.
added html layout for mail component in basic app
Simplified tests.
Merge remote-tracking branch 'upstream/master'

Up to cdbafcfda2a9dcfe56ce791018c6485248babc30

Conflicts:
	config/web.php