add macro for color label; using this macro on pages
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	src/main/webapp/WEB-INF/pages/portal/admin/courses/content/courseTable.ftl
merge courseTable
tables alignment