SAKIII-4860 Enable the ability to configure an internal and an external login system at the same time
Merge branch '1.2.0'
SAKIII-5299 Create HTML/CSS for My Dashboard Activity widget

Squashed commit of the following:

commit c159c5027bce92ac9c66d38aa569ae622375deda
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Mar 16 19:25:12 2012 +0000

    SAKIII-5299 Fixes per comment on Github

commit 6d05db2eb6259ab2d834f5b72d7b010d62e4dfba
Merge: 15c0470 fcd649e
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Mar 16 17:01:26 2012 +0000

    Merge remote-tracking branch 'origin/master' into SAKIII-5299

commit 15c0470c08d2e9e21587305dfea2c6c4a7798029
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Mar 16 15:01:02 2012 +0000

    SAKIII-5299 Fix cross browser issues

commit 04b993db7aa8ff2ae1671a64e7a02b819cf25555
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Mar 16 13:51:03 2012 +0000

    SAKIII-5299 Create HTML/CSS for the option bar on top of the widget

commit 936c8224cefdf16b31322be05f6ebbf6eba39556
Merge: 5fcda72 40e5c53
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Fri Mar 16 10:24:39 2012 +0000

    Merge remote-tracking branch 'origin/master' into SAKIII-5299

commit 5fcda72d276d973b734aa50c53c0bdefc649debf
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Mar 15 19:43:22 2012 +0000

    SAKIII-5299 Implement annotations HTML/CSS

commit 6eceb8bb448210c2e8aae9e2b004a7edc24c1e80
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Mar 15 13:31:14 2012 +0000

    SAKIII-5299 Create user x shared/added document y HTML/CSS implementation

commit fdc6b9f621920eb7e3b399b84600e29d47bb1876
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Thu Mar 15 10:48:54 2012 +0000

    SAKIII-5299 Complete update activity HTML/CSS

commit a1a9ce3a50f7c402191accfe7fa0cc1a8bda19df
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 14 17:15:11 2012 +0000

    SAKIII-5299 Create the 'no activity' view

commit fae3f5a515cbc6af4bf56a902a3566e6f1f73170
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 14 14:51:25 2012 +0000

    SAKIII-5299 Create the Dashboard Activity widget and change config so it's included on the dashboard
Merge pull request #1890 from bp323/SAKIII-5299

SAKIII-5299 Create HTML/CSS for My Dashboard Activity widget
SAKIII-5319 - CSS3 gradients + accessibility for activity widget
https://jira.sakaiproject.org/browse/SAKIII-5319
SAKIII-4702 make profile picture dropdown and lhnav page options keyboard accessible
SAKIII-3350 changed to select box for unit selection
Merge pull request #1862 from jsloane/SAKIII-5284

SAKIII-5284 hide x-axis scroll bar in inserter widget
Merge pull request #1866 from jsloane/SAKIII-5286

SAKIII-5286 fix IE8 bug in mymemberships
Merge pull request #1868 from christianv/SAKIII-5289

SAKIII-5289 - Remove unused URLs in config.js
Merge pull request #1878 from jsloane/SAKIII-3648

SAKIII-3648 initially disable assignlocation save button
Merge pull request #1881 from jsloane/SAKIII-4616

SAKIII-4616 changed some links to not open in a new window
Merge pull request #1884 from gsilver/SAKIII-5302

SAKIII-5302  - rearrange footer links
SAKIII-5018 - resolve conflicts
SAKIII-5018 - removing override from featured content - no longer needed