merge before pull.
Merge branch 'master' of github.com:phimpme/android

Conflicts:
	Phimpme/.idea/libraries/gridlayout_v7_19_1_0.xml
	Phimpme/.idea/libraries/play_services_4_3_23.xml
GPS management function basically improved.