dragonwu
Merge remote-tracking branch 'origin/master'

Conflicts:
	MicroCalendar/src/com/microcalendar/service/UserService.java