+ refactored package structure to put everything under /lib
+ enhanced app.js to return promise when the callback is absent
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/context-configuration-test.js
- test