fixes for sql and service
Merge branch '0.2.5' of github.com:shawnostler/js-api-framework into 0.2.5

Conflicts:
	package.json