test
Merge branch 'master' of https://github.com/tbergehenegouwen/office

Conflicts:
	src/pos/DbManager.java
login
login
Merge branch 'master' of https://github.com/tbergehenegouwen/office into tycho

Conflicts:
	src/pos/admin/CategoryList.java
	src/pos/admin/SupplierList.java
login
Merge pull request #3 from tbergehenegouwen/tycho

Tycho