gallery and color change
Merge branch 'master' into dev_server
Merge branch 'dev_server' of https://github.com/jlemm45/PrintStash into dev_server