Merge branch 'master' into FLOE-128
FLOE-128: Modified layout to use more Bootstrap grids. Hopefully this will fix issues on mobile devices.
Merge remote-tracking branch 'jhung/FLOE-128' into FLOE-128