ajie
Merge branch 'devs' of https://github.com/pplc01/crimezone into devs

Conflicts:
	CrimeZone/.idea/libraries/play_services_4_0_30.xml
Merge branch 'devs' of https://github.com/pplc01/crimezone into devs

Conflicts:
	CrimeZone/.idea/gradle.xml
	CrimeZone/CrimeZone.iml
	CrimeZone/CrimeZone/CrimeZone-CrimeZone.iml
	CrimeZone/CrimeZone/src/main/java/com/ppl/crimezone/activities/GsonParser.java
Merge branch 'devs' of https://github.com/pplc01/crimezone into devs

Conflicts:
	CrimeZone/.idea/gradle.xml
	CrimeZone/.idea/libraries/android_maps_utils_0_3.xml
	CrimeZone/Libraries/AndroidSlidingUpPanel/library/library.iml
dor
Merge branch 'devs' of https://github.com/pplc01/crimezone into devs