added balance for each address
fix conflicts
Merge pull request #66 from colkito/feature/addresses-balance

added balance for each address
Fixed socke-emit-on

Merge branch 'master' into feature/socket-io-support

Fix conflicts:
	js/controllers/home.js