Conflicts:
README.md
docs/configuration.md
lib/executor.js
package.json
Changes in the docs were merged manually and updated to correctly
describe the 2.x layout.
Breaking change.
In the new 2.x project layout, definition of loopback Models is out of
scope of the boot process. The bootstrapper only configures existing
models - attaches them to a dataSource and the app object.
Miroslav Bajtoš
Rand McKinney