Fixed calendar code indentation
Removed some unnecessary calendar functionality
Merge branch 'mntnorv-dev' into dev

Conflicts:
	res/layout/event_layout.xml
	src/lt/socialheat/android/MainActivity.java