Commit for pull 2/4/2014
Merge branch 'master' of
https://github.com/blacknight0117/CalendarBeta.git

Conflicts:
	CalendarBeta/.pydevproject