Merge branch 'gh-pages' into develop
Made time stuff cleaner
Finished radiobuttons
Merge branch 'develop' into gh-pages