#249 #278 search button enterkey action & search.js merge into main.js
Merge branch 'develop' of
https://github.com/NHNNEXT/2014-01-HUDI-ROLLINGPUPPY.git into develop

Conflicts:
	rollingPuppy/src/main/webapp/javascripts/main.js