Merge pull request #1 from jgmdv/develop

Initial merge from develop with initial design of web pages.
Merge pull request #2 from jgmdv/develop

Fixed some bugs. App ready for develop.
Added buttons and dropdown
Merge pull request #4 from artjplim/develop

Added buttons and dropdown
fixed bugs
New bugs fixed
Add little into page title
Merge branch 'master' of https://github.com/jgmdv/timekeeping-novare-ojt into develop
Merge pull request #5 from artjplim/develop

fixed bugs
Merge branch 'develop' of https://github.com/jgmdv/timekeeping-novare-ojt into develop
Committed changes in tomcat