Merge pull request #58 from JBrianGordon/brianbranch

fixes galleries
commiting changes for pull
fixes conflict in schema
Adds last model test and lightbox