fixed conflicts in app layout
Deleted apps task file
Removed conflicts in app layout
Fixed indentation in user.css
Merge branch 'C1_mennaamr_#91_Facebook_login' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#40_Registration
Merge branch 'C1_mennaamr_#40_Registration' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#40_Registration
Fixed User Model
Fixed indentation in callbacks controller
Merge branch 'C1_mennaamr_#91_Facebook_login' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#40_Registration
Fixed syntax error in user model
Updated migration files
Issue #46, call the model from navbar
Issue #46 , remove redundant views and add flash message
Merge branch 'master' into C2_abuali_#46_invite_committee_again

Conflicts:
	Idearator/app/controllers/admins_controller.rb
	Idearator/app/views/admins/invite.html.erb
	Idearator/app/views/layouts/application.html.erb
Issue #46, add modal dialoge again
fix spaces
Merge branch 'master' into C2_abuali_#46_invite_committee_again

Conflicts:
	Idearator/app/views/layouts/_navigation.html.erb
Merge branch 'master' into C2_abuali_#46_invite_committee_again

Conflicts:
	Idearator/app/views/layouts/application.html.erb
Issue #39 , slim down the ideas controller
Issue #39, Add send_edit_notifications in idea.rb