Update basic files
Update pages
Update classes
Update form classes
Update readme
Merge origin/master

Conflicts:
	help.inc.php