Cosmetic changes
[Big one]: preview.loadJson simplified immensely ..

However, this also means that every RABL file that created
a JSON before has had to be partly / wholly re-written to pass
the new JSON
Merge branch 'master' of https://github.com/abhinavc/web-application

Includes changes related to new preview

Conflicts:
	app/assets/javascripts/students/response.js.coffee
Merge branch 'master' of heroku.com:drona

Conflicts:
	app/assets/javascripts/students/response.js.coffee
 A syntax error corrected
[Guessing]: <img alt> attribute essential to carousel working properly
[preview]: No need for a closing </img> tag when creating a <img> node
[grading]: Load preview (all versions) of the question being currently graded
Merge pull request #132 from adamarla/master

Refactored Tokens Controller method
[grading-panel]: Re-organized the HAML and JS

Grading panel HAML files in their own area.
First steps towards making the grading panel palatable to the end-customer.
 minor styling changes
Removed last of toolbox/_grd-* files

The files have been rationalized and collated within shared/grading
[grading]: Minor structural and styling changes to the grading toolbar
Merge branch 'master' of https://github.com/abhinavc/web-application
Reduced transparency for grd-typeahead
Merge branch 'preview'
[grading]: minor styling changes
Merge branch 'preview'
Merge remote-tracking branch 'heroku/master'