CS-5424: Adds index to Id field in KeywordIndex table
Merge remote-tracking branch 'upstream/master' into CS-5424
updated translation resources
Merge pull request #718 from m038/CS-5424

Cs 5424
CS-5424 - [slow query] very slow articles query
Merge pull request #720 from takeit/sql-optimize

CS-5424 - [slow query] very slow articles query
updated translation resources
CS-5433 - Adding authors to article overloads
Merge branch 'master' of https://github.com/sourcefabric/Newscoop into sql-optimize
permissions fixes
authors fix
CS-5432: Adds method for only retrieving authors
CS-5432: Merges methods and adds parameter for users results
Merge remote-tracking branch 'rafal/sql-optimize' into CS-5432

Conflicts:
	newscoop/src/Newscoop/NewscoopBundle/Controller/AuthorsController.php
Merge pull request #2 from m038/CS-5432

Cs 5432
authors fixes
Merge pull request #716 from ahilles107/fix_performance

fix countByUser function queries
Merge branch 'master' of https://github.com/sourcefabric/Newscoop into sql-optimize
merge master
merge fix