refactoring on admin_controller and narrative_controller
Merge pull request #7 from felixsoum/backend-dev

refactoring on admin_controller and narrative_controller
Setup Heroku
Set sqlite3 to dev
Precompile assets
Merge pull request #8 from felixsoum/heroku

Heroku
add mysql environment
Revert to 9cd7c002
add comment and remove x86-mingw32 in Gemfile.lock
Merge pull request #9 from felixsoum/backend-dev

add mysql environment
Merge pull request #10 from felixsoum/frontend-dev

Frontend dev
Merge pull request #11 from felixsoum/frontend

Integrate frontend and backend
Change to relative path for narrative, image and audio. Link language and category to narrative. Add sample data for narrative, category, language and comment
Merge branch 'backend'
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...
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.