added google + fb auth

still need design changes etc..
Merge remote-tracking branch 'origin/AlanJackMVP' into AlanJackMVP

Conflicts:
	Capstone/nbproject/private/private.xml