Merge remote-tracking branch 'ronxs/master'

Conflicts:
	src/Protalk/MediaBundle/Entity/MediaRepository.php
Merge remote-tracking branch 'ronxs/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Protalk/MediaBundle/Entity/MediaRepository.php
Removed  from docblock
Merge branch 'master' of github.com:protalk/protalk
Merge branch 'master' of github.com:protalk/protalk
Merge branch 'doctrine-migrations' of github.com:artur-gajewski/protalk
Merge branch 'master' of github.com:protalk/protalk
Merge branch 'master' of github.com:protalk/protalk
Sorting in admin for several entities
Merge pull request #202 from lineke/master

Added a lot of sorting to admin classes