compatibility fixes for Logic Designer multiple database support
Merge branch 'master' of https://github.com/EspressoLogicCafe/espresso-chat

Conflicts:
	authProvider.js
	controllers/IndexController.js
	controllers/LoginController.js
	conversations-project.json
	conversations.sql
	index.html
	partials/index.html
	scripts/angular-route.min.js
	scripts/angular.min.js
	scripts/app.js
	scripts/routes.js
	services/API.js
	styles/app.css