added admini in other modes
Merge branch 'master' of https://github.com/kryptick/bubblebathbay_sandbox.git
Merge remote-tracking branch 'origin/master'
thumbs.db commit