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

Conflicts:
	app_60/db/development.sqlite3
Change to relative path for narrative, image and audio. Link language and category to narrative. Add sample data for narrative, category, language and comment
fix the build fails (add dummy data into fixture for test)
Merge pull request #12 from felixsoum/backend-dev

Change to relative path for narrative, image and audio. Link language an...
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