Begin time card
Merge remote-tracking branch 'origin/master'

Conflicts:
	pegasus/src/main/java/fr/poulpi/pegasus/MainActivity.java
	pegasus/src/main/java/fr/poulpi/pegasus/fragments/SearchFragment.java
FIx project