commit test
branch test
Merge branch 'br-tst'

Conflicts:
	OnlilneTaksimetre/src/lets/taxi/onlinetaksimetre/JSONParser.java
Merge branch 'develop'