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
Merge branch 'master' of github.com:protalk/protalk
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
Fix bug in setLanguageCategories method
Testing commit appears in github