zzz
Merge branch 'master' of https://github.com/Codlex/JSMS

Conflicts:
	JSMS/src/com/codlex/jsms/networking/users/BaseUser.java
BaseUser conflict resolved