Added localhours and minutes
Fixed merge
Merge branch 'master' of github.com:pogestudio/graph-epicness