Removed imports
fixed merge
Updated .gitignore prior to including facebook android sdk
Fixed .gitignore to work better with facebook android sdk
Added Facebook login
Merge branch 'master' of https://github.com/axelniklasson/blue-java