Criticism update
Merge branch 'master' of https://github.com/kokosg/ecommerceTeam

Conflicts:
	src/models/ConnectionManager.java