Adding more stuff
Merge branch 'master' of https://github.com/evolutionise/SDP-Calendar

Conflicts:
	Calendar/bin/Calendar.apk
	Calendar/bin/classes.dex
	Calendar/bin/classes/model/Block.class
	Calendar/bin/resources.ap_
	Calendar/src/com/example/calendar/Calendar.java