outstanding changes to frontend branch
merge fix
modernizr