merge
Merge remote-tracking branch 'killinsun/killinsun' into killinsun

Conflicts:
	bin/AddressBook/PaneAddress.class
	bin/TopView/MenuPanel.class
	bin/dbHelper/DbHelper.class
	src/AddressBook/FrmEdit.java
	src/AddressBook/PaneAddress.java
	src/dbHelper/DbHelper.java