#13 Json parsing & classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	myCarpooling/res/values/strings.xml