added regex for queries
Merge branch 'master' of https://github.com/mohamedkomalo/city-mapper

Conflicts:
	test/com/orange/citymapper/queries/ShortestPathQueryTests.java
Merge branch 'master' of https://github.com/mohamedkomalo/city-mapper