removes dead code formatting divs we don't want to format

Conflicts:
	public/stylesheets/application.css
adjusting focus color for select2 container

Conflicts:
	public/stylesheets/application.css
	public/stylesheets/select2_customizing.css

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

Conflicts:
	Gemfile
	test/functional/members_controller_test.rb
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

Conflicts:
	app/views/projects/settings/_members.rhtml
	public/stylesheets/application.css

Conflicts:
	app/views/projects/settings/_members.html.erb

Conflicts:
	app/views/projects/settings/_members.html.erb

Conflicts:
	app/views/projects/settings/_members.html.erb
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

Conflicts:
	app/assets/images/suche_lupe.png
	app/controllers/members_controller.rb
	app/views/members/_autocomplete_for_member.rhtml
	app/views/projects/settings/_members.rhtml
	public/images/search_magnifier.png
	public/images/suche_lupe.png
	public/stylesheets/application.css
	public/stylesheets/select2_customizing.css

Conflicts:
	config/locales/de.yml
	config/locales/en.yml
get multiple remote selection to work properly
port to rails3

Conflicts:
	Gemfile.lock
allow Users to be scoped with full name, too
start loading roles right away
escape principal and role names in members autocompleter
fix non-impaired members tab submit button: used to jump around because of floating siblings, applied 'clearfix'
fixes partial name for html request in memberscontroller's autocompletion
Fixes Members Creation:

The Select2 queries return comma-seperated elements that we need to handle
individually. The way we seperate those elements was broken, resulting in a
failing test.
fix id seperation used inside autocompletion for impaired users
renamed user and role id input for non-impaired users, gives us prettier generated ids
Reworked Tests:

* fixes broken existing principal and group membership features
* adds new tests for adding groups and users as principals with both an impaired and non-impaired user

Conflicts:
	features/groups/group_memberships.feature
	features/step_definitions/project_member_steps.rb
readd role search translation
pluralize search translations, as we use multi-selects
we need an id for find_project not a project_id.
fixes issue with mass_assignment protection and role_ids