fixing migrations #114 #115
fixing views #114 #115
added UMLS #114 #115
pulled master 3 #114 #115
added things in controller #214
added budget sources #151
Merge pull request #263 from yousraHazem/c3_yasmin_budget_new

added budget sources #151
Merge pull request #264 from yousraHazem/c2_nayera_view_project_tasks1

added things in controller #214
fixes master
added a test #178
trying tests #114 #115
added things for viewing project #178
resolved ocnf. to merge #178
Merge pull request #267 from yousraHazem/c2_nayera_view_project_tasks1

C2 nayera view project tasks1
fixing migrations #114 #115
fixing views #114 #115
fixed UMLS #114 #115
tests are now working #114 #115
removed the validation of the uniqueness of the email #114 #115
Merge branch 'MEM7_master' of https://github.com/yousraHazem/topsoft-13 into MEM7_master

Conflicts:
	MME7/app/controllers/budget_source_projects_controller.rb
	MME7/app/controllers/budget_sources_controller.rb
	MME7/app/controllers/projects_controller.rb
	MME7/app/controllers/tasks_controller.rb
	MME7/app/helpers/budget_source_projects_helper.rb
	MME7/app/views/budget_source_projects/addamount.html.erb
	MME7/app/views/budget_sources/new.html.erb
	MME7/spec/controllers/budget_sources_controller_spec.rb