Merge branch 'erika' of https://github.com/RonXS/protalk
Merge branch 'master' of https://github.com/RonXS/protalk
Merge branch 'master' of https://github.com/protalk/protalk

Merged upstream
Added a link to the 'how to upgrade your vagrant box'-guide in the README.
Removed the speaker data directly from the media fixture.
Also added a hard date, to prevent errors when tests are ran around midnight.
Merge pull request #188 from pascaldevink/readme-update-for-vagrant

Readme update for vagrant
Merge branch 'master' of https://github.com/protalk/protalk into improved-tests
Merge pull request #189 from pascaldevink/improved-tests

Fixed failing unit tests
Made composer install the dev dependencies in the vm
Make sure the db tables are created, only once
Removed test
Update the database structure on every vm load
Make sure the db creation is not executed once seeded
Merge branch 'InvestigatingPermissionsInVM' of github.com:EricHogue/protalk into InvestigatingPermissionsInVM

Conflicts:
	support/puppet/modules/protalk/manifests/symfony2.pp