Merge branch 'master' of https://github.com/zigapk/GimVic-suplence-android

Conflicts:
	app/src/main/java/com/zigapk/gimvic/suplence/Data.java
	app/src/main/java/com/zigapk/gimvic/suplence/Suplence.java
Merge branch 'master' of https://github.com/zigapk/GimVic-suplence-android

Conflicts:
	app/src/main/java/com/zigapk/gimvic/suplence/Data.java
	app/src/main/java/com/zigapk/gimvic/suplence/Suplence.java