commented out sock file for production database
remove link to the tag page for student. add back link to level & achievement. without them it's too hard to discover the items.
Merge branch 'master' of github.com:Coursemology/coursemology.org

* 'master' of github.com:Coursemology/coursemology.org:
  commented out sock file for production database
improve EXP giveaway.
can select all to approve/delete bunk of request.
change from 'feasible' to 'general' in landing page
added coding question models
coding question creating and updating UI
display coding questions in training, enable editing and deleting of coding questions
path working
code block for training description
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/add_path

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/helpers/application_helper.rb
fixed conflict