SQLite file.
Merge branch 'frontend-dev' of https://github.com/felixsoum/youdeliberate into frontend-dev

Conflicts:
	app_60/db/development.sqlite3
Single narrative view now displays a jPlayer media element. Partially linked to info in database.
Clicking on a bubble in the main view will fetch code from /narratives/play/ID instead of /narratives/show/ID
Committing DB file before attempting a merge.
Merge branch 'backend-dev' of https://github.com/felixsoum/youdeliberate into frontend-dev

Conflicts:
	app_60/Gemfile.lock
	app_60/db/development.sqlite3
Recreated show.html.erb. Oops.
Db file.
Removed references to -x86-mingw32 in Gemfile.lock
Merge pull request #14 from felixsoum/frontend-dev

Frontend dev
Fix revert of admin_controller.rb
Merge pull request #15 from felixsoum/backend

Integrate player from frontend and backend