Added npm start script
Merge branch 'develop' into feature/user