Halfway through facebook login
Merge branch 'master' of https://github.com/natthu/FLWApp

Conflicts:
	android/.idea/workspace.xml