conflict test
Merge branch 'conflict-test'

Conflicts:
	OnlilneTaksimetre/src/lets/taxi/onlinetaksimetre/JSONParser.java