Cleaning UP
some cleanup
Merge branch 'master' of https://github.com/amarpotghan/wallet

Conflicts:
	.idea/workspace.xml