I decided to create a new protect to get rid of the Facebook null pointer error. So the new folder its calle logyca and the app itself. So IDK if this going to damage the rest of the work.
Merge branch 'social-connect' of https://github.com/julidaz/LOGYCA-APP into social-connect

Conflicts:
	Logyca/project.properties
	Logyca/res/layout/fragment_login.xml
	Logyca/res/values/strings.xml
	LogycaApp/src/com/logyca/app/SplashActivity.java