Renamed API method.
Merge branch 'master' of https://github.com/prettygoodguy/pulpit

Conflicts:
	js/main.js
Autologin with Facebook.