ProjectSerializer implemenation completed. Changed periodic task so that non-end-dated instances are cleared on each call to monitor_instances().
Refactored /projects endpoint after meeting with Chris
SECRET_KEY autogeneration completed
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja
Remove MachineVoting/ApplicationScore feature from herja
ApplicationBookmark serializer field completed for use on application detail page (ATMO-361)
ApplicationSerializer used to create a details page with get/patch controls
QuickFix to decorators (Bad variable when non-authenticated user hits authenticated URL)
Removed bad secret_key gen-file
Added necessary migration for application bookmark
Necessary admin changes now that featured is gone
Merge branch 'ATMO-358' into herja
Merge conflict resolved..
Merge branch 'ATMO-361' into herja
Merge branch 'ATMO-362' into herja
Forgot to add Project API file
Merge branch 'ATMO-358' into herja
Settings changes needed to be made to make it clear when SECRET_KEY errors occurred
Added option 'reboot_type' to InstanceAction 'reboot', defaults to 'SOFT'
Re-enable reset button. Only set HypervisorDropdown when staff user is present. Fix ATMO-339