Merge branch 'hotfix/gitignore'
Merge branch 'develop'
fixed dashboard template
Merge branch 'hotfix/dashboard' into develop