Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	ParkingMap/.classpath
	ParkingMap/assets/brdatabasehelper.sqlite
	ParkingMap/res/layout/activity_show_info.xml
	ParkingMap/res/menu/list_show.xml
	ParkingMap/src/DataBaseHandler/TestAdapter.java
	ParkingMap/src/DataBaseHandler/imageOnServer.java
	ParkingMap/src/Globa/GlobaVariables.java
	ParkingMap/src/mhst/parkingmap/AddNewPark.java
	ParkingMap/src/mhst/parkingmap/BookmarkItemAdapter.java
	ParkingMap/src/mhst/parkingmap/ListShow.java
	ParkingMap/src/mhst/parkingmap/MainActivity.java
	ParkingMap/src/mhst/parkingmap/ParkingItemAdapter.java
	ParkingMap/src/mhst/parkingmap/SettingsGPS.java
	ParkingMap/src/mhst/parkingmap/SplashActivity.java
	ParkingMap/src/mhst/parkingmap/customDialogSearch.java
	ParkingMap/src/mhst/parkingmap/showInformation.java