Merge branch 'master' into dev
adding hidden image to mess with g+ sharing options
Merge branch 'dev'