Merge pull request #1 from jlongster/master

integrate brick
cleanup javascript and integrate better with flipbox