Merge branch 'master' of https://github.com/swapnilbhagat/MMClient

Conflicts:
	AndroidManifest.xml
	src/com/example/mmclient/activity/SubmitAmountActivity.java