BugFix Timepicker
Merge branch 'master' of https://github.com/gerardevil/devlabsucv2013