Merge branch 'issue-crowdsale-frontend' into smart-property

Conflicts:
	www/index.html
	www/js/TransactionGenerationController.js