Merge branch 'master' into beta

htdocs/index.html

htdocs/plaster-files/css/bootstrap.min.css

htdocs/plaster-files/css/font-awesome.min.css

htdocs/plaster-files/css/magnific-popup.css

htdocs/plaster-files/css/owl.carousel.css

htdocs/plaster-files/css/owl.theme.default.css

htdocs/plaster-files/css/style.css

htdocs/plaster-files/fonts/FontAwesome.otf

htdocs/plaster-files/fonts/fontawesome-webfont.eot

htdocs/plaster-files/fonts/fontawesome-webfont.svg

htdocs/plaster-files/fonts/fontawesome-webfont.ttf

htdocs/plaster-files/fonts/fontawesome-webfont.woff

htdocs/plaster-files/fonts/fontawesome-webfont.woff2

htdocs/plaster-files/img/about1.jpg

htdocs/plaster-files/img/about2.jpg

htdocs/plaster-files/img/author.jpg

htdocs/plaster-files/img/background1.jpg

htdocs/plaster-files/img/background2.jpg

htdocs/plaster-files/img/background3.jpg

htdocs/plaster-files/img/blog-post.jpg