minor change

import section chabge
Merge branch 'master' of https://github.com/dbigelow25/scaha

Conflicts:
	scaha/src/com/scaha/beans/MailTreeBean.java