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
Added Doctrine Migrations and wrote documentation for it
Added more info about migrations
Merge branch 'master' of github.com:protalk/protalk
Updated lock file
Update README.md

Add git submodule update --init command
Merge branch 'master' of github.com:protalk/protalk
Merge branch 'doctrine-migrations' of github.com:artur-gajewski/protalk
Merge pull request #193 from artur-gajewski/doctrine-migrations

Added Doctrine Migrations and wrote documentation for it
add flag into session to prevent multiple view counter increments simply by reloading page
Merge pull request #199 from danneh3826/master

#Issue #174 - add flag into session to prevent multiple view counter increments simply...
Merge branch 'master' of github.com:protalk/protalk
incorrect method used to bind POST data to form, causes 500
Merge pull request #201 from danneh3826/master

incorrect method used to bind POST data to form, causes 500
Merge branch 'master' of github.com:protalk/protalk
Sorting in admin for several entities
renamed session flag to include media object id