Merge pull request #23 from thewillhuang/ng-facebook

add facebook login option
resource backend and tests
fix conflict
Merge pull request #24 from thewillhuang/resourceRoutes

resource backend and tests
pushing changes
Merge pull request #25 from thewillhuang/simon2

pushing changes
change routing from public to app