Merge pull request #25 from junejung/development

return diet restriction filtered result
Merge pull request #27 from junejung/development

fixed filtering error
showing recipe data
Merge pull request #28 from mtulac/megantulac

showing recipe data
Added loading modal, fixed keydown regression
Merge pull request #29 from ndhoule/development

Added loading modal, fixed keydown regression
commit for merge
commit for merge
Merge branch 'development' of github.com:Whoaa512/meal-balance into development

Conflicts:
	client/layouts/index.html
	client/scripts/main.js
change console.log to return