photo-1327 Создание toolbar'a VLC
photo-1327 Создание toolbar'a VLC
use UNIX line endian instead Windows
use UNIX line endian instead Windows
remove ending spaces
replace dup empty lines
remove ending spaces
replace dup empty lines
Merge branch 'VLC'

Conflicts:
	lib/js/jquery.aplayer.js
	offline/gallery.php
	offline/gallery/index.php