Merge #305.
Fix Address Units
Merged #307.
Conflicts:
	www/partials/wallet_address_list.html
Merge branch 'Merge-4-28-2014' into HEAD