Merge pull request #47 from daniellemayne/develop

bugz 4445: limit server actions to appropriate states: develop