updates
Merge branch 'master' of https://github.com/aawantika/frs

Conflicts:
	FinancialApplicationProject/FinancialApplication/src/main/src/edu/gatech/financialapplication/ConsumerSpendingActivity.java
minor update