fixed issue with timezone problems.
Merge branch 'master' of github.com:xebia/xke-ng