commit changes to merge from zal_Dev
resolve merge conflict
Work on ajax comment
working on comments