pull
my work so far
Merge branch 'master' of https://github.com/alin72/Hemlock-Library

Conflicts:
	HemlockLibrary/src/java/accounts/Account.java
	HemlockLibrary/src/java/accounts/AdminAccount.java