Add popup block
Merge branch 'master' of https://github.com/grammaright/evezaryEvent

Conflicts:
	app/assets/javascripts/webScript.js
	app/views/home/popUp_2.html.erb
Fix WebScript
Merge branch 'master' of https://github.com/grammaright/evezaryEvent

Conflicts:
	app/assets/javascripts/webScript.js
web 매장찾기 bug fix