Merge branch 'pr/1'

Conflicts:
	package.json
	public/css/main.min.css
	public/js/angularjs-all.min.js
	public/js/main.min.js
	public/views/transaction/tx.html