Merge branch 'master' into develop
Merge branch 'master' into develop
imports from theinvoice
separates tests into local, shared and remote cases
removes use of #trigger: to remove dependency on flow
Merge pull request #1 from flow-stack/feature/upgrade

Feature/upgrade