Merge branch 'master' into develop
Add sessions and cookies to webservice

Please use "nf start" instead of foreman start
login & logout & authentication working
clear nav & header
add delete activity & update activity service
video list
app user service
app user service add
delete subscriber, add appuser

update admin video list, nav bar, login
app user detail
added policy service
Merge branch 'develop' of github.com:FityCity/web-service into develop
Merge branch 'develop'
read to push to master
removed S3 keys
Merge branch 'develop' of github.com:FityCity/web-service into develop
Merge branch 'develop'