Merge branch 'master' into master_sake_bomb

Conflicts:
	app/controllers/activity.js
	app/controllers/application.js
	app/models/marketplace.js
	app/routes/marketplaces/activity.js
	app/templates/components/txn-customer.hbs
	app/templates/marketplaces/index.hbs
	app/templates/results/customers_table.hbs
	app/templates/results/logs_table.hbs
	app/templates/results/results_filters_header_with_counts.hbs
	app/templates/results/transactions_table.hbs
	app/templates/start.hbs
	bower.json
	static/less/components.less
	static/less/results.less
	static/less/scaffolding.less
	static/less/start.less
	test/integration/activity.js