Merge branch 'master' into profile
Merge branch 'master' of github.com:dharanimanne/feedback
commented all mailers but comments ajax working