unsaved file
Merge branch 'master' of https://github.com/adhigunasurya/JalinSuara

Conflicts:
	workspace/JalinSuara/src/com/jalinsuara/android/project/SubProvinceActivity.java
	workspace/JalinSuara/src/com/jalinsuara/android/project/ViewPagerProjectActivity.java
resolve