Merge stuff
Merge branch 'master' of https://github.com/Drvanon/odeo
Merge branch 'master' of https://github.com/Drvanon/odeo
Clean up base, add img stuff
Lightbox