First Commit.
Second Commit;
3th commit;
Conflicts: Fixed
	src/com/mxJ/bean/User.java
#new feature