Merge branch 'master' into esegev
Adding tagging functionality to reviews

Also edited page templates to show tags
Merge branch 'esegev'