Implements facebook login
Merge branch 'master' of github.com:tfogo/cruisecontrol
user service gets user info
Merge branch 'master' of github.com:tfogo/cruisecontrol
small
resolve merge conflict
resolve merge conflict
Fail
Merge branch 'master' of github.com:tfogo/cruisecontrol
stuff