Revert "Revert "User.java update""

This reverts commit 79d6ac9bb8bd041d98562e9a15a222164a06bd04.
Revert "Revert "Revert "User.java update"""

This reverts commit 26165db97218df83218a3df5b582ee8dd166f022.
Revert "Revert "User.java update""

This reverts commit 79d6ac9bb8bd041d98562e9a15a222164a06bd04.
Revert "User.java update"

This reverts commit 376c94c4e313a51dabbb5ef72fb41fcc868a4e59.

Conflicts:
	lib/src/main/java/com/xlythe/textmanager/User.java