fixed the forum that hasd a bug(show comments and add comment were not showing.). and also deleted the shop keepers(decided by the team)
Merge branch 'master' of https://github.com/meet-projects/shooksookbytes-y2-2013
fixed some conficts