Fixing licence
Merge branch 'develop' into feature/Forms