uncomment meal.jade
Merge branch 'development'
change some database