part of notes
Merge branch 'master' of github.com:iPlanGroup/iPlan

Conflicts:
	.classpath
	src/com/bbk/model/EventInfo.java
	src/com/bbk/model/PlanNotify.java
	src/com/bbk/model/TermInfo.java
	src/com/bbk/model/VacationManager.java