Merge branch 'staging'
Merge branch 'staging'
sso
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
merge conflict
move canvas info into secrets/environment
rubocop
Merge branch 'master' of github.com:beyond-z/beyondz-platform
cleanup and documentation
Merge branch 'staging' of github.com:beyond-z/beyondz-platform
rubocop
Merge branch 'sso_login' of https://github.com/adamdruppe/beyondz-platform into adamdruppe-sso_login

Conflicts:
	config/secrets.yml
	env.sample
Merge branch 'adamdruppe-sso_login' into staging
Merge branch 'staging' of github.com:beyond-z/beyondz-platform
first pass of csv import
notification when new application is finalized
forgot to add view files
 file not supposed to be in this branch oops