Merge
Merge branch 'master' of https://github.com/RockerM4NHUN/Calendar

Conflicts:
	Res/Delete.java
	Res/Rewrite.java
	Res/Window.java