Merge pull request #218 from Cipa/develop

Update Qm to latest colorbox + some aditional fixes
Merge pull request #219 from Cipa/develop

Misc