some changes for UI
Merge branch 'master' of https://github.com/bsejawal/libra
Conflicts:
	src/services/edu/smude/UserService.java