Misc system improvements and bug fixes
Merge remote-tracking branch 'upstream/master' into upd3

Conflicts:
	wa-system/contact/waContactForm.class.php
	wa-system/view/waViewHelper.class.php
WA update
Update