Merge branch 'master' into bootstrap3
Add edge extra files
Merge branch 'bootstrap3'
Merge branch 'master' into edge-extra
small fix comment only
Merge branch 'edge-extra'