Modifie controllers'tests
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	db/schema.rb
	spec/controllers/acquisition_categories_controller_spec.rb
	spec/controllers/activity_categories_controller_spec.rb
	spec/controllers/admin_settings_controller_spec.rb
	spec/controllers/attribute_categories_controller_spec.rb
	spec/controllers/attribute_modules_controller_spec.rb
	spec/controllers/languages_controller_spec.rb
	spec/controllers/module_projects_controller_spec.rb
	spec/controllers/pemodules_controller_spec.rb
	spec/controllers/permissions_controller_spec.rb
	spec/controllers/projects_controller_spec.rb
	spec/controllers/users_controller_spec.rb
	spec/controllers/wbs_activities_controller_spec.rb
	spec/controllers/wbs_project_elements_controller_spec.rb
	spec/controllers/work_element_types_controller_spec.rb