Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Remove "Test Network" in footer
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares
Merge branch 'develop' into bitshares

Conflicts:
	app/templates/footer.html