Merge branch 'master' into modif_btnVote_changed_size_Manon

Conflicts:
	src/main/java/com/arcbees/bourseje/client/resources/Resources.java
	src/main/resources/com/arcbees/bourseje/client/resources/styles.css