v16 용
Merge branch 'master' of https://github.com/wonjoo9315/HOA_demoday

Conflicts:
	HumanOfAjou/app.yaml
	HumanOfAjou/apps/static/js/hoa.js