Resolve merge conflicts (wip)
Add datepickers on other tabs
Update routes
Merge branch 'sake-bomb-phase3' of https://github.com/kyungmin/balanced-dashboard into sake-bomb-phase3

Conflicts:
	app/controllers/cards.js
	app/controllers/customers.js
	app/controllers/disputes.js
	app/controllers/invoice.js
	app/controllers/invoices.js
	app/controllers/logs.js
	app/controllers/marketplace.js
	app/templates/activity.hbs
	app/templates/marketplaces/apply.hbs
	app/templates/results/results_filters_header.hbs
Keep transactions and orders tabs active
Move account statements and settings under my marketplace
Beautify
Remove console log
Fix indentation
Fix indentation
Update strapped
Various fixes
Update Transactions page header
Merge pull request #1238 from kyungmin/sake-bomb-phase3

Navigation changes