remove merge
Merge branch 'master' of https://github.com/Jayin/SiyuanGroup.git

Conflicts:
	library/TimePicker/bin/timepicker.jar