SAKIII-4877 Widget drop placeholder is visible in view mode
SAKIII-4889 The last row should not be deletable
Merge pull request #1588 from jsloane/SAKIII-4708

SAKIII-4708 Create unit test for problem seen in SAKIII-4703
SAKIII-4724 - Fixing the empty pageholder bugs
Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SAKIII-4871

* 'SAKIII-4871' of git://github.com/bp323/3akai-ux:
  SAKIII-4889 The last row should not be deletable
  SAKIII-4877 Widget drop placeholder is visible in view mode
SAKIII-4883 Inserter Bar does not float well when browser window is resized
Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4871
SAKIII-4889 Tweak implementation of last row deletion
SAKIII-4724 - Changing default content
Merge branch 'SAKIII-4871' of git://github.com/bp323/3akai-ux into SAKIII-4871

* 'SAKIII-4871' of git://github.com/bp323/3akai-ux:
  SAKIII-4889 Tweak implementation of last row deletion
  SAKIII-4883 Inserter Bar does not float well when browser window is resized
SAKIII-4724 - Fixing the min-height
SAKIII-4893 Empty row placeholder does not disappear when adding in a title
Merge remote-tracking branch 'nicolaas/contentauthoring' into SAKIII-4871
SAKIII-4724 - Changing min height
SAKIII-4882 - Google Maps widget - map size option is displayed on rendered page
SAKIII-4755 - Remove shortenString method

Squashed commit of the following:

commit 17236e849b9a62299de178a6713857151db14c87
Merge: 8d7f303 d00b165
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Wed Feb 8 10:37:53 2012 -0800

    Merge remote-tracking branch 'christianv/removeShortenString' into christianv-removeShortenString

commit d00b16593683f7cd4033877793daf1c88a217689
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Tue Feb 7 17:01:33 2012 -0800

    SAKIII-4755 - remove safeOutput when 3.'s
    https://jira.sakaiproject.org/browse/SAKIII-4755

commit 0d75f2ca14cd85f65bca47cc4f2c83dc41dcab66
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Fri Jan 27 09:53:29 2012 -0800

    SAKIII-4755 - Fix shortensetting error + limit 300

commit cbf8def4a4c19d62f1991f7994144b3a4515af36
Merge: fb427cb b689a31
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Fri Jan 27 09:37:04 2012 -0800

    Merge branch 'master' into removeShortenString

commit fb427cb51c6630b743a48a2f3b252bab9b506475
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Dec 21 15:06:26 2011 -0800

    SAKIII-4755 - Remove the shortenString method
Merge pull request #1533 from christianv/removeShortenString

SAKIII-4755 - Remove shortenString method
Merge pull request #1532 from christianv/fixglobals

SAKIII-4754 - Limit the amount of JavaScript globals.

* christianv/fixglobals:
  SAKIII-4754 - Fix global variables http://jira.sakaiproject.org/browse/SAKIII-4754
Merge pull request #1572 from jsloane/SAKIII-4331

SAKIII-4331 update participants list after accepting join request
SAKIII-4716 - Replace getTotalCount method with Underscore.js

Squashed commit of the following:

commit 248baf3b3a216423318fecf5987d38d661fd67a5
Merge: 7be9ff0 95778c3
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Wed Feb 8 11:01:47 2012 -0800

    Merge remote-tracking branch 'christianv/SAKIII-4716' into christianv-SAKIII-4716

commit 95778c3a8e9b9c627bc566558ec6a888404aa30f
Merge: ce53910 b689a31
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Jan 25 17:21:31 2012 -0800

    SAKIII-4716 merge master + fix merge conflicts

commit ce539103c57746a72260875c7687b237f0538e8d
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Sat Dec 31 18:18:04 2011 -0800

    SAKIII-4716 - Replace getTotalCount method with Underscore.js