Merge branch 'master' of https://github.com/Lumaart/web into touchSwipe-plugin
jj2