changed timeout
fixed bug with enrollment view
changed if not
changed error message
Merge remote-tracking branch 'upstream/devel'