Changed default grace period to 30 seconds
Changed deprecated bodyparser for server
Changed package.json versions
Merge branch 'develop'