Merge pull request #815 from mjallday/master

some bs to fix discrepancies between tests and real-life
add modals on order page, refactor modals

Conflicts:
	app/components/credit_customer_modal.js
	app/components/debit_customer_modal.js
convert other modal components to use a base modal class
fix customer test
debugging change-password
components
modal components
marketplace settings
bump version of shapeshifter
made more modal views into components
fuck travis
generate years dynamically
reset customer tests
fixing credit customer modal
Merge pull request #817 from daliwali/master

bump version of shapeshifter
fixed modals
view results
Merge pull request #819 from tarunc/hide-download

Hide Download Button
Merge branch 'master' into show-modal-errors
fixed some tests