Generate classpage
fix controller classpage
Merge branch 'master' into ClassPage

Conflicts:
	protected/runtime/application.log
Merge branch 'ClassPage'