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

Conflicts:
	CrimeZone/.idea/gradle.xml
	CrimeZone/.idea/libraries/appcompat_v7_19_0_1.xml
	CrimeZone/.idea/libraries/play_services_4_2_42.xml
	CrimeZone/CrimeZone.iml
	CrimeZone/CrimeZone/CrimeZone-CrimeZone.iml
Merge branch 'devs' of https://github.com/pplc01/crimezone into devs

Conflicts:
	CrimeZone/.idea/libraries/support_v4_19_1_0.xml
	CrimeZone/CrimeZone.iml