document state layout
Merge branch 'develop' into lost_password