Re-include entity framework for Test Project
Merge branch 'dev' fixed connection between frontend and backend. Still a bug surrounding the persistence of circles on the screen. Working on it; but progress.
Migrations, I'm pretty sure this is a bad idea.
Bad idea part 2
Revert "Migrations, I'm pretty sure this is a bad idea."

This reverts commit c60bf7e83c5b6d808e4b26f26d61c2467f590d99.
Revert "Bad idea part 2"

This reverts commit 389267d5307449a4e24ce6d4b62970b89b7db9cf.
Merge branch 'backend-new'
Small changes to stabilize merge
Fixed the thumbs button position. It should work in IE and Safari now too.
Fixed the ordering of audio for the JPlayer and the picture display.
Added the functions for agree and disagree and the display-only when a narrative is selected
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino.git
Merge branch 'frontend' of https://github.com/StickMen/KungFuRhino into backend-new

Conflicts:
	YouDeliberate/Models/FilterViewModel.cs
Merge branch 'backend-new' of https://github.com/StickMen/KungFuRhino into backend-admin-ui
fixed merge
Merge branch 'backend-new' of https://github.com/StickMen/KungFuRhino into backend-admin-ui