Merge branch 'issue-119' of git://github.com/Tocacar/protalk
Merge branch 'issue-31' of git://github.com/Tocacar/protalk
Merge branch 'preview' of git://github.com/Tocacar/protalk
Merge branch 'master' of github.com:protalk/protalk
Merge branch 'master' of github.com:protalk/protalk
Merge branch 'issue-20' of git://github.com/Tocacar/protalk
Merge branch 'issue-20' of git://github.com/Tocacar/protalk
Merge branch 'master' of github.com:protalk/protalk
Merge branch 'master' of github.com:protalk/protalk
Update media and category entity classes to reflect new language structure
Add new language and languageCategory entity classes along with new LanguageRepository class
Merge branch 'master' of github.com:protalk/protalk
Correct auto-generated method names in Category entity class
Fix queries in CategoryRepository to accommodate new category/language structure
Fix queries in MediaRepository to accommodate new category/language structure
Fix a bug in batch unpublish method for MediaAdminController (set status to unpublished rather than published)
Merge branch 'languages' of git://github.com/Tocacar/protalk
First version (not complete yet) of language changes in admin and some other minor improvements
Several changes for languageCategories and different way of adding speakers and tags
Added role based security