Merge branch 'master' into development
Improved buold for deploying
Monir correction in package.json file
Merge branch 'development'