Merge pull request #24 from AmitPatel-BoTreeConsulting/development

Development merge to master
Merge branch 'development'
#26 crud for instructor
Merge remote-tracking branch 'botree/development' into development_feature_26
#28 CRUD added for courses
#26 merged with #28
#28 Activate Deactivate method added
#29 relation table user and role
Merge branch 'master_issue_28' into development_feature_26

Conflicts:
	config/locales/en.yml
en.yml and course form updated
#28 when we select image it should show as preview  .
#26 eligibilities added
Merge pull request #30 from BoTreeConsulting/development_29

Relation table user and role
#28 Ckeditor added at courses
#26 added permition to foundation admin
#28  Image issue solved
Merge branch 'development' into master_issue_28

Conflicts:
	db/schema.rb
Merge branch 'development_feature_26' into development

Conflicts:
	app/assets/javascripts/application.js
	config/locales/en.yml
	db/schema.rb
Merge branch 'development' into development_feature_25

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/_navigation.html.haml
	config/environments/development.rb
	config/locales/en.yml
	config/routes.rb
	config/settings.yml
	db/schema.rb