Change port to 2222
Merge branch 'master' of github.com:boatd/boatd

Conflicts:
	boatd/api.py