gh-pages cleaned
dev updates
from master
Merge branch 'master' into gh-pages
mirror master