Moved status state into admin module.
Merge branch 'dev'