Merge commit '13b19bc24891696ffb8f9d5eacbc1df1be9e3687'
Merge branch 'master' of https://github.com/phuonghuynh/TechLooper
Merge branch 'master' of https://github.com/khoa-nd/TechLooper
Merge branch 'master' of https://github.com/johnsonpham/TechLooper

Conflicts:
	src/main/webapp/assets/modules/skill-table/skill-table.fac.js
update
update
Merge commit '3f29af1c7f2bdacbdd8e6e929e2da0abbd904093'
Merge commit 'aa214ccdb5cf4dc7e3e73518b493b7ba344fcda0'
Merge branch 'master' of https://github.com/khoa-nd/TechLooper
Merge branch 'master' of https://github.com/phuonghuynh/TechLooper
Merge commit 'dff53344cdebe8afac8af7c6dc4d9a30a968cd6a'