sync
sync

Conflicts:
	bin/LTCApp.apk
	bin/classes.dex
	bin/classes/au/edu/act/ltc/About.class
	bin/classes/au/edu/act/ltc/EditCalender.class
	bin/classes/au/edu/act/ltc/EmailActivity.class
	bin/classes/au/edu/act/ltc/MainActivity.class
	bin/classes/au/edu/act/ltc/R$id.class
	bin/classes/au/edu/act/ltc/R$layout.class
	bin/classes/au/edu/act/ltc/R$menu.class
	bin/classes/au/edu/act/ltc/R$string.class
	bin/classes/au/edu/act/ltc/R$style.class
	bin/resources.ap_
	gen/au/edu/act/ltc/R.java
	res/values/strings.xml
	src/au/edu/act/ltc/Calendar.java
	src/au/edu/act/ltc/EditCalender.java