local commit
Merge branch 'master' of https://github.com/nitinzd/brails

Conflicts:
	Gemfile.lock
	config/initializers/rails_admin.rb
	spec/controllers/users_controller_spec.rb
Added env/devlopment.rb
Passing rspec for topics controller
Removed conotroller question and contents
Merge pull request #26 from SpiderGears/master

Removed Questions and Contents Controller