temp

Signed-off-by: Wouter Vroege <wouter@woutervroege.nl>
Merge branch 'refs/heads/dev'

Signed-off-by: Wouter Vroege <wouter@woutervroege.nl>

Conflicts:
	apps/default/Controllers/MainMenu.php
	apps/default/Controllers/Media.js
	apps/default/Controllers/Media.php
	apps/default/Views/MediaMenu.php
	lib/MYSQL-DAOS/Media.php
clear

Signed-off-by: Wouter Vroege <wouter@woutervroege.nl>
all files

Signed-off-by: Wouter Vroege <wouter@woutervroege.nl>
image title under gallery item

Signed-off-by: Wouter Vroege <wouter@woutervroege.nl>