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

Conflicts:
	app_60/db/development.sqlite3
Minor changes to the /narratives/play controller.
Merge branch 'frontend-dev' of https://github.com/felixsoum/youdeliberate into frontend-dev
Merge branch 'master' into frontend-dev
Merge branch 'master' into frontend-dev

Conflicts:
	app_60/db/development.sqlite3
Merge branch 'frontend-dev' of https://github.com/felixsoum/youdeliberate into frontend-dev
Display number of views in single narrative view. Very ugly for now.
DB: Added data in the created_at column of the n_comments table.
Comments are now displayed on the single narrative view. Ugly display for now.
"Be the first to comment!" will appear if there are no comments in the db for that narrative.
Updated main view appearance

Pretty slick new look. Check it out.
Merge branch 'frontend-dev' of https://github.com/felixsoum/youdeliberate into frontend-dev
Added new pages and tweaked sunburst animation

Added contact page, about us page, changed the sunburst load animation,
changed the page text (don't worry, it's still minimal).
Main view is now bilingual

Also changed bubble data source to relative addressing. Also added a
bunch of crappy flag images we may or may not use.
Sunburst data is now dynamic. Added test db items.

Sorry about all the files you're about to download.
Narratives will now be grouped by category (colour) on the main view.
Merge branch 'frontend-dev' of https://github.com/felixsoum/youdeliberate into frontend-dev
Merge pull request #18 from felixsoum/backend-dev

Backend dev
Merge pull request #17 from felixsoum/frontend-dev

Frontend dev
Merge branch 'frontend' into backend

Conflicts:
	app_60/app/controllers/narratives_controller.rb
	app_60/app/views/narratives/play.html.erb
	app_60/db/development.sqlite3