Merge branch 'master' into merge_captables
remove reference to inv_captable.js
Merge branch 'merge_captables' into testing

Conflicts:
	app/index.html