- update methods & convertToJSON method

Don't know if we actually need the convertToJson method but just in case
Merge remote-tracking branch 'origin/master'

Conflicts:

	Ex3/vs-glukas-chat/src/ch/ethz/inf/vs/android/glukas/protocol/VectorClock.java