added entity types: Disc, Gallery, Image
resolved merge confilcts, updated to new pom (dbHelper)
updated to new MUID