gallery
Merge branch 'master' of https://github.com/ditma1/japreview

Conflicts:
	lib/modules/gallery/lib/views/subgallery.jade
Merge branch 'master' of https://github.com/ditma1/japreview

Conflicts:
	lib/modules/gallery/lib/views/subgallery.jade

	webview fix
Merge branch 'master' of https://github.com/ditma1/japreview

Conflicts:
	lib/modules/gallery/lib/views/subgallery.jade

	webview fix
Merge remote-tracking branch 'origin/master'