complete framework
Merge branch 'master' into gaoce-11-1

Conflicts:
	ourplatform/templates/ourplatform/index.html