syncing since i cannot sync branch
sync

v
sync
sync

Conflicts:
	gen/au/edu/act/ltc/R.java