.
Merge branch 'master' of
https://github.com/MobileAndroidDevelopment/MoneySac.git

Conflicts:
	MoneySac/res/layout/activity_recurring_entry.xml