fixed merge
merge gallery
fuck
fixed merge gallery and master branches