Merge branch 'master' of https://github.com/gchr/taxisnet_cp.git

Conflicts:
	taxisnet_easy_cp.user.js
Merge branch 'master' of https://github.com/gchr/taxisnet_cp.git

Conflicts:
	taxisnet_easy_cp.user.js