Form & timeout fix, messages, per user resource
Merge pull request #24 from kknavs/master

Form & resource update, timeout fix