(Bluefox) formatting
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	lib/adapter.js
(Bluefox) working on authentication
Merge pull request #37 from GermanBluefox/master

(Bluefox) working on authentication