Merge branch 'version-barebone'
add bower modernizr
Merge branch 'master' into version-barebone