#26 crud for instructor
Merge remote-tracking branch 'botree/development' into development_feature_26
#26 merged with #28
Merge branch 'master_issue_28' into development_feature_26

Conflicts:
	config/locales/en.yml
#26 eligibilities added
#26 added permition to foundation admin
Merge branch 'development_feature_26' into development

Conflicts:
	app/assets/javascripts/application.js
	config/locales/en.yml
	db/schema.rb
#31 CRUD actions added for workshop
#31 confirm message modified for course activate and deactivate
Used the new Ruby 1.9 hash syntax.
removed self from course.rb (update_attribute)
Extra blank line removed (course controller).
#31 Space missing after comma. Course Controller
#31 Space missing inside {.
Space missing inside }. resoved (course)
#31 Space missing after comma. done
Space inside square brackets detected. (removed)
#31 Source files should end with a newline (\n).
#31 Do not use parentheses for method calls with no arguments. Done
#31 Use 2 (not 1) spaces for indentation. Done
Merge branch 'development' into master_issue_28

Conflicts:
	db/schema.rb