added close button to modals
Merge branch 'master' into gh-pages