Merge branch 'codex-customer' of https://github.com/salej1/blackstar-dev into codex-customer

Conflicts:
	blackstarWeb/WebContent/WEB-INF/appengine-generated/local_db.bin