Business template and new features
Merge branch 'feature/business-features-13' into develop

resolved #13