merge
Merge branch 'master' of github.com:spidermandl/Diary

Conflicts:
	CalanderSquare/bin/calendersquare.jar
rm bin