FU-04 Update user profile for public access
Merge branch 'master' into FU-04_Users-Notifications
FU-02 Create follow relationship

Still needs to be able to update contact list with ajax

Update new debate page for errors

It would be nice to have this directly on the modal
Remove friends invitation when creatin debate
Remove unnecessary title
Update modal height
Merge branch 'master' into FU-02_Users-Follow
FO-01_GeneralLayout General layout of the home page improved
Merge branch 'master' into FO-01_GeneralLayout
FU-02 Update "followed by" list dynamically with ajax
FU-01 Fix the user profile to correctly display the tabs on reload

When reloading, the tab stays opened
Fixed a bug when updating user infos
FD-02_SearchBar Search bar for debates functional
The result of the search is displayed on the result list
FD-03 Bugfix: Modal does not appear invisible when loading the debate index page

Error message is only displayed once when creating a debate with errors
FO-07 Basic private messages

Still a lot of work to do on the views
Some bugs with displaying read/unread conversations
FO-07 Correctly show read/unread messages

Redirect to conversations index when trying to show other users conversations
FO-07 Form checking for new private message
Merge branch 'FU-02_Users-Follow' into master_dzeta

Conflicts:
	db/schema.rb
Merge branch 'FD-02_SearchBar' of https://github.com/Asmoune/Maia into master_dzeta
Display User debates. Modification to the model of Debate.
Merge branch 'FD-03_Create-Debate' into master_dzeta
Merge branch 'FU-10_UserDebates' of https://github.com/lizetho/Maia into master_update

Conflicts:
	app/controllers/debates_controller.rb
	app/models/debate.rb
	app/views/users/show.html.erb
	db/schema.rb
Merge branch 'master_update' into FO-07_Private-Messages

Conflicts:
	app/controllers/users_controller.rb
	db/schema.rb
FD-05_DebateLayout General debate layout