Merge branch 'stagging'
show author name of module when view module in collection
Merge branch 'fix_bugs_from_aminh'