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
Fix Travis phpunit call - use correct location for config
Merge pull request #161 from Bendihossan/fix-travis-builds

Fix Travis phpunit call - use correct location for config
Tests RSS feed shows valid info
PSR2 fixes
Initial tests for ExploreController
Fix breaking build by using latest composer and bring lock file in sync
Merge pull request #160 from Bendihossan/tests

Tests RSS feed shows valid info
Update media and category entity classes to reflect new language structure
Add new language and languageCategory entity classes along with new LanguageRepository class
Rename Speaker fixture
Add fixtures for Categories, Mediatypes, Tags, and Media entities