CLC-1519 - [Front-end] Implement new activity designs
https://jira.media.berkeley.edu/jira/browse/CLC-1519
Merge pull request #849 from christianv/CLC-1519

CLC-1519 - [Front-end] Implement new activity designs
Merge pull request #854 from raydavis/raywip

CLC-1518 Downgrade JRuby to 1.7.2
NOJIRA Clean out obsolete test data (and fix test bug) before starting on CLC-1451