Google+ sign in is WORKING! YAY!
Further developments in settings page including fragment dialog
trying to merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/5a/e0fd64dff03400131f83d1fddf0ab5e9
	.metadata/.plugins/org.eclipse.core.resources/.projects/25/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/25/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/25/.indexes/e4/81/23/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/25/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/25/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/25/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/25/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/25/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/25Hours/.indexes/a0/5f/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/25Hours/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/5.tree
	.metadata/.plugins/org.eclipse.core.resources/.root/9.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/556048020.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	25/AndroidManifest.xml
	25/bin/25.apk
	25/bin/AndroidManifest.xml
	25/bin/R.txt
	25/bin/classes.dex
	25/bin/classes/com/twentyfive/Login$1.class
	25/bin/classes/com/twentyfive/Login.class
	25/bin/classes/com/twentyfive/R$id.class
	25/bin/dexedLibs/google-play-services_lib-bc822b99104cdd49464d1360b880ff98.jar
	25/bin/resources.ap_
	25/gen/com/twentyfive/R.java
	25/res/layout/activity_login.xml
	25/res/menu/fragment_dialog.xml
	25/src/com/twentyfive/Login.java