added facebook and google login
Merge branch 'master' of https://github.com/godiane/UsbongFITS