update v2
Merge branch 'recruit_test_mp' of
https://github.com/nmhung89/project_base.git into recruit_test_mp

Conflicts:
	media_pop/key_mapping/static/js/home.js
Merge branch 'recruit_test_mp' of
https://github.com/nmhung89/project_base.git into recruit_test_mp

Conflicts:
	media_pop/key_mapping/static/js/home.js