top up bismillah
Merge branch 'master' of https://github.com/farahs/MWallet

Conflicts:
	src/com/example/other/DatabaseHandler.java