Merge pull request #209, #215 and #217

Fixed 24h display, glyphicons from Bootstrap 3 and allow numeric keypad