NOJIRA Update to Rails 3.2.13
CLC-1508 Bump master version to v6
CLC-1508 Force foundation to 4.0.5 instead of 4.0.x due to display size formatting bugs
Merge pull request #836 from ctweney/rails-3.2.13-master

CLC-1508 Master branch Update to Rails 3.2.13
CLC-1179 Redo Sakai Sites proxy API to match CalCentral needs
Preparation for sharing formatted site data between My Activities, My Classes, & My Groups
CLC-1179 Add Sakai Announcements to My Activity
No changes to front-end code yet, & so the resulting UX does not match the newest design
CLC-1179 Fix My Activities front-end display
- Clump by day rather than by second
- Preserve ordering within the clump
- Add "Announcements" text
CLC-1179 Code format change