services, landmark updated
Merge branch 'master' of https://github.com/DamirGor/Gorojanin

Conflicts:
	citizen_main/AndroidManifest.xml
	citizen_main/src/com/app/citizen/MainActivity.java
	landmark/AndroidManifest.xml
	landmark/ant.properties
	landmark/assets/html/cerk.html
	landmark/assets/html/fire.html
	landmark/assets/html/theatr.html
	landmark/build.xml
	landmark/proguard-project.txt
	landmark/project.properties
	landmark/res/drawable-hdpi/ic_launcher.png
	landmark/res/drawable-hdpi/sight.png
	landmark/res/drawable-ldpi/ic_launcher.png
	landmark/res/drawable-mdpi/ic_launcher.png
	landmark/res/layout/list_sight.xml
	landmark/res/layout/sight_activity.xml
	landmark/res/layout/sight_fragment.xml
	landmark/res/menu/main.xml
	landmark/res/menu/mapshow.xml
	landmark/res/menu/search.xml
	landmark/res/values/strings.xml
	landmark/res/xml/sight_record.xml
	landmark/src/com/example/landmark/FragmentActivity.java
	landmark/src/com/example/landmark/Sight.java
	landmark/src/com/example/landmark/SightDataBase.java
	landmark/src/com/example/landmark/SightFragment.java
	landmark/src/com/example/landmark/SightLab.java
	landmark/src/com/example/landmark/SightListActivity.java
	landmark/src/com/example/landmark/SightListFragment.java
	landmark/src/com/example/landmark/SingleFragmentActivity.java
	services/AndroidManifest.xml
	services/ant.properties
	services/build.xml
	services/proguard-project.txt
	services/project.properties
	services/res/drawable-hdpi/ic_launcher.png
	services/res/drawable-ldpi/ic_launcher.png
	services/res/drawable-mdpi/ic_launcher.png
	services/res/drawable-xhdpi/ic_launcher.png
	services/res/layout/main_services.xml
	services/res/values/strings.xml
	services/src/com/app/citizen/services/activity/FineActivity.java
	services/src/com/app/citizen/services/activity/HospitalActivity.java

services/src/com/app/citizen/services/activity/ServicesMainActivity.java