Bottom loading sur la timeline
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/youp/ingesup/com/youp/view/HomeActivity.java
	app/src/main/java/youp/ingesup/com/youp/view/fragment/EventFragment.java
Merge remote-tracking branch 'origin/master'