clean code
Merge remote-tracking branch 'origin/master'

Conflicts:
	henm1314g3/bcn_management_widget.xml
	henm1314g3/employee_management_widget.xml
	henm1314g3/learning_resource_widget.xml