trying masonry
Merge branch 'angular' of https://github.com/cgle/bam-backend into angular