Move expireDate > active
Merge branch 'devel'