Fix indent outdent buttons
Reset bar always
use strict here
Proper indentation
DRAG AND DROP FINALLY WERKS
Fix double firing of validation error
Fix cancel button linking in create question forms
Fix add achievements form cancel button
Merge pull request #37 from jsyeo/jason-dev

Fix indent outdent buttons
Merge pull request #38 from jsyeo/jsyeo-image-upload

Fix drag and drop
Merge branch 'master' of github.com:Coursemology/coursemology.org into dev/raymoond_dev

Conflicts:
	app/assets/javascripts/image_uploader.js
Merge pull request #39 from jsyeo/jsyeo-user-validation-fix

Fix double firing of validation error
Merge pull request #40 from jsyeo/jsyeo-cancel-button-fix

Fix cancel button linking in create question forms
Merge pull request #41 from jsyeo/jsyeo-fix-achievements-cancel-button

Fix add achievements form cancel button
Merge branch 'master' of github.com:Coursemology/coursemology.org into dev/raymoond_dev