code review changes
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/application_controller.rb
	modified:   app/helpers/devise_helper.rb
	new file:   app/helpers/temp.rb
	modified:   app/models/stage.rb
	modified:   app/views/devise/registrations/edit.html.haml
	deleted:    app/views/home/_member_details.html.erb
	new file:   app/views/home/_member_details.html.haml
	modified:   app/views/home/index.html.erb
	modified:   app/views/layouts/_footer.html.erb
	modified:   app/views/layouts/_footer1.html.haml
	modified:   app/views/layouts/_navbar.html.erb
	modified:   app/views/layouts/_topsection.html.haml
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/member_mailer/welcome_email.html.erb
	modified:   app/views/member_mailer/welcome_email.text.erb
	new file:   app/views/member_mailer/welcome_email1.html.haml
	deleted:    config/email.yml
	modified:   config/environments/development.rb
	modified:   config/initializers/active_admin.rb
	deleted:    config/initializers/constant.rb
	new file:   config/initializers/rails_config.rb
	modified:   config/initializers/setup_mail.rb
	modified:   config/routes.rb
	new file:   config/settings.yml
	modified:   db/migrate/20140310132550_add_admin_flag_to_members.rb
	deleted:    db/migrate/20140310175739_add_admin_data_to_member.rb
	deleted:    db/migrate/20140310183652_skip_admin_confirmation_to_member.rb
	deleted:    vendor/cache/activeadmin-0.6.0.gem
	new file:   vendor/cache/activeadmin-0.6.3.gem
	deleted:    vendor/cache/atomic-1.1.14.gem
	new file:   vendor/cache/atomic-1.1.16.gem
	new file:   vendor/cache/bcrypt-3.1.7.gem
	deleted:    vendor/cache/bcrypt-ruby-3.1.2.gem
	deleted:    vendor/cache/compass-0.12.2.gem
	new file:   vendor/cache/compass-0.12.3.gem
	deleted:    vendor/cache/d3_rails-3.4.1.gem
	new file:   vendor/cache/d3_rails-3.4.3.gem
	deleted:    vendor/cache/devise-3.2.2.gem
	new file:   vendor/cache/devise-3.2.4.gem
	deleted:    vendor/cache/fastercsv-1.5.5.gem
	deleted:    vendor/cache/hamlbars-2.1.0.gem
	new file:   vendor/cache/hamlbars-2.1.1.gem
	new file:   vendor/cache/jquery-rails-2.3.0.gem
	deleted:    vendor/cache/jquery-rails-3.1.0.gem
	deleted:    vendor/cache/jquery-ui-rails-4.1.1.gem
	new file:   vendor/cache/jquery-ui-rails-4.2.0.gem
	deleted:    vendor/cache/multi_json-1.9.0.gem
	new file:   vendor/cache/multi_json-1.9.2.gem
	new file:   vendor/cache/psych-2.0.4.gem
	deleted:    vendor/cache/slop-3.4.7.gem
	new file:   vendor/cache/slop-3.5.0.gem
	deleted:    vendor/cache/thread_safe-0.1.3.gem
	new file:   vendor/cache/thread_safe-0.2.0.gem
	deleted:    vendor/cache/tins-1.0.0.gem
	new file:   vendor/cache/tins-1.0.1.gem
	deleted:    vendor/cache/uglifier-2.4.0.gem
	new file:   vendor/cache/uglifier-2.5.0.gem
erb_to_haml_conversion
erb_to_haml_conversion
	modified:   config/settings.yml