fix datetime compare
Updated settings
Merge pull request #127 from praekelt/feature/issue-74-datetime-compare

fix datetime compare
Merge branch 'feature/issue-145-login-lockout' into develop