Fixed merge issue.
Merge branch 'development' of github.com:climbingcode/bam- into development
Completed refactor of brand.js, corrected minor errors with .erb rendering.