CLC-61 Need better 404 page
https://jira.media.berkeley.edu/jira/browse/CLC-61
NOJIRA Bump app version to 12
Merge pull request #1151 from ctweney/version12Bump

NOJIRA Bump app version to 12
CLC-1928 - Upgrade to angular 1.1.5
https://jira.media.berkeley.edu/jira/browse/CLC-1928
CLC-1939 - UCB logotype should be in the footer
https://jira.media.berkeley.edu/jira/browse/CLC-1939
Merge pull request #1152 from christianv/CLC-1928

CLC-1928 - Upgrade to angular 1.1.5
Merge pull request #1150 from shacker/CLC-61

CLC-61 Need better 404 page
Merge pull request #1153 from christianv/CLC-1939

CLC-1939 - UCB logotype should be in the footer
CLC-1780 - Tasks: simplify what happens when there are no tasks
https://jira.media.berkeley.edu/jira/browse/CLC-1780
Merge pull request #1154 from christianv/CLC-1780

CLC-1780 - Tasks: simplify what happens when there are no tasks
[CLC-1912] JRuby 1.7.4 Upgrade
CLC-1938 - Add loading animation to My Academics
https://jira.media.berkeley.edu/jira/browse/CLC-1938
Merge pull request #1156 from christianv/CLC-1938

CLC-1938 - Add loading animation to My Academics
Merge pull request #1155 from yuhunglin/CLC-1912

[CLC-1912] JRuby 1.7.4 Upgrade
CLC-1986 Canvas coming_up API replaced by upcoming_events
CLC-1986 Fix Canvas upcoming_events test & make less fragile
Merge pull request #1157 from raydavis/raywip

CLC-1986 Canvas coming_up API replaced by upcoming_events
CLC-1781 - Tasks: add a separate button to activate the calendar pop-up when editing a task
https://jira.media.berkeley.edu/jira/browse/CLC-1781
Merge pull request #1159 from christianv/CLC-1781

CLC-1781 - Tasks: add a separate button to activate the calendar pop-up when editing a task
Bump app version to v13