Some Changes
Merge branch 'master' of https://github.com/f2rf2r/OnTime-iOS
Need to update