Merge branch 'branch1' of github.com:7860845/onboard into branch1

Conflicts:
	new.Class.php
Merge branch 'branch1' of github.com:7860845/onboard into branch1

Conflicts:
	new.Class.php