changed chmod
changed chmod
changed algorithm to calculate locations
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	cli/config.php
	features/bootstrap/FeatureContext.php
	features/bootstrap/MapHelper.php
	features/bootstrap/MessageHelper.php
	features/bootstrap/SilexContext.php
	features/bootstrap/TileHelper.php
	features/bootstrap/domain/CityHelper.php
	features/bootstrap/domain/UserHelper.php
	features/bootstrap/silex/CityHelper.php
	features/bootstrap/silex/UserHelper.php
	mock/Service/LocationCalculator.php
	silex/Repository/DBALCity.php
	src/Context/Player/CreateNewCity.php
	src/Interactor/CreateCity.php
	src/Request/CreateCity.php
	src/Service/LocationCalculator.php
	src/View/City.php
	tests/Silex/Repository/CityTest.php
	tests/Silex/Repository/MapTest.php
changed with netbeans ide