update
Merge branch 'master' of https://github.com/johnsonpham/TechLooper

Conflicts:
	src/main/webapp/assets/modules/skill-table/skill-table.fac.js