Merge remote-tracking branch 'upstream/master'

Conflicts:
	tracker.js
Merge pull request #2 from intelliot/master

Edit email body to display balances in human-readable format, instead of JSON