Merge
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Added new timepicker
Merge branch 'develop' of github.com:ahomatthew/SimpleSeer into develop
Removed seconds from timefilter
Merge
Merge branch 'develop' of github.com:ahomatthew/SimpleSeer into develop
Merge
Merge pull request #1024 from brooksryba/develop

Develop