Activity, Event, Behaviour, MultipleChoiceQuestion, Answer models created
Merge pull request #3 from subhash-shah-kcspl/models

Models Implementation
devise integrited and all erbs converted to haml
removed erbtohaml gem as it's no longer needed
Added paperclip
Updated models to incorporate associations
Merge pull request #4 from subhash-shah-kcspl/models

Model Associations
Merge branch 'master' into master_1

Conflicts:
	db/schema.rb
Merge branch 'master' into master_1

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #5 from subhash-shah-kcspl/master_1

Master 1
Merge branch 'master' into master_enhancement_2

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.haml
	config/routes.rb