Geert : gson serialization
Merge remote-tracking branch 'origin/NFC' into NFC

Conflicts:
	KSM/src/be/cegeka/ksm/MainActivity.java
Geert : gson serialization
Merge remote-tracking branch 'origin/NFC' into NFC

Conflicts:
	KSM/src/be/cegeka/ksm/MainActivity.java
Geert : Merge