Patrick
merging things
missing a curly bracket
working on read only on detail
working on pages tied to navbar
related_names to application
after Brians merge fixed videoplus and fixed user ownership
Merge branch 'ryansstuff'