clean up
Merge branch 'master' of https://github.com/backbone-app/app

Conflicts:
	src/base/README.md