Updates to add in state
Add in state service.
Reverse decorator changes.
Cleanup APIKEY and remove APIGROUP
Merge branch 'current-sprint' into ISSUE-132-upload-file-complex