Merge branch 'develop' into feature/adding_tags
users can tag photos
Videos now have tags and the video index has a tag cloud
Merge conflict resolved in the application helper
Videos, photos, and questions have tags
Merge branch 'feature/adding_tags' into develop