ui
no message
Merge branch 'master' of https://github.com/huynt57/ProjectSEM2_BKAP_C1209J

Conflicts:
	build/classes/GUI/AccountManager/AccountPanel$1.class
	build/classes/GUI/AccountManager/AccountPanel$2.class
	build/classes/GUI/AccountManager/AccountPanel$3.class
	build/classes/GUI/AccountManager/AccountPanel$4.class
	build/classes/GUI/AccountManager/AccountPanel.class
	build/classes/GUI/AccountManager/ChangePassword$1.class
	build/classes/GUI/AccountManager/ChangePassword$2.class
	build/classes/GUI/AccountManager/ChangePassword.class
	build/classes/GUI/LoginScreen/LoginThread.class
	build/classes/GUI/MainScreen/MainPanel.class
	build/classes/GUI/MainScreen/TimeThread.class
	build/classes/GUI/MedicinesManager/MedicinesPanel.class
	src/GUI/MedicinesManager/MedicineNew.java
Merge branch 'master' of https://github.com/huynt57/ProjectSEM2_BKAP_C1209J

Conflicts:
	build/classes/GUI/Classes/SwitchPaneThread.class
	build/classes/GUI/MainScreen/MainPanel.class
	build/classes/GUI/MainScreen/TimeThread.class