changed time back to 5:00
Merge branch 'develop'