Refactor the onModuleLoad
Merge branch 'merge'

Conflicts:
	war/SoftwareengineeringATeam.html