removes dead code formatting divs we don't want to format
adjusting focus color for select2 container

Conflicts:
	public/stylesheets/application.css
	public/stylesheets/select2_customizing.css
starting on infinite scrolling of select2 inside members form. member itself might be working, roles are definitely not

Conflicts:

	app/controllers/members_controller.rb
	app/models/principal.rb

Conflicts:

	app/controllers/members_controller.rb

removes deprecated test for autocompletion

Conflicts:

	Gemfile
	app/views/members/_new_member_form.rhtml
	public/javascripts/members_select_boxes.js

Conflicts:
	Gemfile
reformatting the new member form inside project settings

Conflicts:

	app/views/members/_member_form.rhtml
	app/views/projects/settings/_members.rhtml
	public/stylesheets/application.css

Conflicts:

	app/views/projects/settings/_members.rhtml
autocompletion for roles and members in project settings, now with infinite scrolling

Conflicts:

	Rakefile
	app/controllers/members_controller.rb
	app/models/principal.rb
	app/models/role.rb
	app/views/layouts/base.rhtml
	app/views/members/_new_member_form.rhtml
	public/javascripts/members_select_boxes.js
	public/stylesheets/select2_customizing.css

Conflicts:

	app/views/layouts/base.rhtml
	public/javascripts/members_select_boxes.js

don't need to mark members form as 'new'. everyone will see cause it's awesome

Conflicts:

	app/views/projects/settings/_members.rhtml

Conflicts:

	app/views/members/_new_member_form.rhtml

Conflicts:

	app/views/projects/settings/_members.rhtml

Conflicts:

	app/views/members/_member_form_non_impaired.rhtml
	app/views/projects/settings/_members.rhtml

Conflicts:

	app/controllers/members_controller.rb
	app/views/layouts/base.rhtml
	app/views/members/_autocomplete_for_member.rhtml
	app/views/members/_member_form_impaired.rhtml

Conflicts:
	app/controllers/members_controller.rb
	app/views/layouts/base.rhtml
	public/javascripts/application.js
get multiple remote selection to work properly