Adding Modernizr and WebShims
Updating timer
Merge branch 'develop'