Vues swypables du tutorial faites ! Nouvelles Photos
Merge remote-tracking branch 'origin/master'

Conflicts:
	TipsyApp/src/main/res/layout/activity_connection.xml
	TipsyApp/src/main/res/layout/activity_show_event.xml