Merge pull request #1 from 7860845/branch1

Branch1
some changes
Merge branch 'master' of github.com:7860845/onboard into branch1
Merge branch 'branch1' of github.com:7860845/onboard into branch1

Conflicts:
	new.Class.php