Squashed commit of the following:

commit db2743bf7c516479092b710b079f1e00bc8afe5a
Merge: 8d11412 b74237e
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:50 2014 -0700

    Merge commit 'b74237e3ee809b899c6d1bd50b51a0ece5f467fc' as 'modules/ui-resources-module'

commit b74237e3ee809b899c6d1bd50b51a0ece5f467fc
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:50 2014 -0700

    Squashed 'modules/ui-resources-module/' content from commit b7c4991

    git-subtree-dir: modules/ui-resources-module
    git-subtree-split: b7c4991ba016e278407b7e123dead8a509a8f2d2

commit 8d114127fae72e30ffd453046e3b38e1d7a2df50
Merge: 4827f9c e147550
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:48 2014 -0700

    Merge commit 'e147550c0d591d1423f5b0560a231cdbbadf60e8' as 'modules/ui-pipelines-module'

commit e147550c0d591d1423f5b0560a231cdbbadf60e8
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:48 2014 -0700

    Squashed 'modules/ui-pipelines-module/' content from commit a00d7b5

    git-subtree-dir: modules/ui-pipelines-module
    git-subtree-split: a00d7b5a2255be44a709306dc56f2ba166981a6d

commit 4827f9cb7d15416c39ea152b5f5bec9a7e085a05
Merge: 60b781c ffc3b7d
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:46 2014 -0700

    Merge commit 'ffc3b7dfa4d4342f5d620eec4fb586658f4cafbc' as 'modules/ui-pipeline-builder-module'

commit ffc3b7dfa4d4342f5d620eec4fb586658f4cafbc
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:46 2014 -0700

    Squashed 'modules/ui-pipeline-builder-module/' content from commit e16e9d7

    git-subtree-dir: modules/ui-pipeline-builder-module
    git-subtree-split: e16e9d78bd686a37cefd8ae3fc9b8f05868246b5

commit 60b781c87172cd36dbdf3c106098c24d326c9b0d
Merge: 3ce359d 3c64f50
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:45 2014 -0700

    Merge commit '3c64f5022aff10d7717773d14c0d775dfb42bdb6' as 'modules/ui-disk-resource-module'

commit 3c64f5022aff10d7717773d14c0d775dfb42bdb6
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:45 2014 -0700

    Squashed 'modules/ui-disk-resource-module/' content from commit 631d083

    git-subtree-dir: modules/ui-disk-resource-module
    git-subtree-split: 631d0830a7d4a36f72ec8901f0fa06e5acb82ec6

commit 3ce359dd1f298590217cdab7e6efbb7d7f3f0c8c
Merge: bdda442 c3656da
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:43 2014 -0700

    Merge commit 'c3656da255160b0828f9480f70d104196b3c3949' as 'modules/ui-commons-module'

commit c3656da255160b0828f9480f70d104196b3c3949
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:43 2014 -0700

    Squashed 'modules/ui-commons-module/' content from commit 3ceefdd

    git-subtree-dir: modules/ui-commons-module
    git-subtree-split: 3ceefddaadbf08a634c40f2e02b74585a3e17f88

commit bdda4429621d357b97b0359a0c426a713119ce1d
Merge: 9247364 81cfb11
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:41 2014 -0700

    Merge commit '81cfb1143857139b564d729d6858696903d8a462' as 'modules/apps-widgets-module'

commit 81cfb1143857139b564d729d6858696903d8a462
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:41 2014 -0700

    Squashed 'modules/apps-widgets-module/' content from commit 28d6293

    git-subtree-dir: modules/apps-widgets-module
    git-subtree-split: 28d6293f6303e28b430f342e99c5f8d771e220b0

commit 9247364a10432b8a07b61ac7c049c440100e236c
Merge: 8227644 eafbf81
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:40 2014 -0700

    Merge commit 'eafbf819c5479d2f34367b5e7bd18c6351f62244' as 'modules/ui-apps-integration'

commit eafbf819c5479d2f34367b5e7bd18c6351f62244
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:40 2014 -0700

    Squashed 'modules/ui-apps-integration/' content from commit ec2bbaa

    git-subtree-dir: modules/ui-apps-integration
    git-subtree-split: ec2bbaa4df3d5a82d5a8a939106050fbf60946f7

commit 8227644b3f69e6e4a9cb80b6cfb51a8645864090
Merge: d5723c7 8b0087a
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:38 2014 -0700

    Merge commit '8b0087a1d7e906c00fe0509612e3160a0b8d93ba' as 'modules/ui-applications-module'

commit 8b0087a1d7e906c00fe0509612e3160a0b8d93ba
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:38 2014 -0700

    Squashed 'modules/ui-applications-module/' content from commit ef64da6

    git-subtree-dir: modules/ui-applications-module
    git-subtree-split: ef64da6fae9583adfbd986aa0019417eeabfa2d2

commit d5723c7f4ea5b8eeb2ffeacaddba06d044164003
Merge: 0838689 d87637c
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:36 2014 -0700

    Merge commit 'd87637cdd465bc9b746e30ffc80cdaa0f178029c' as 'applications/de-webapp'

commit d87637cdd465bc9b746e30ffc80cdaa0f178029c
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:36 2014 -0700

    Squashed 'applications/de-webapp/' content from commit 37f39bb

    git-subtree-dir: applications/de-webapp
    git-subtree-split: 37f39bb4b6cf84b69e7d066abdbbc3f599146fa3

commit 0838689c914479e0bd403e2922852b91dd6be3d0
Merge: 67ac404 a6727a3
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:34 2014 -0700

    Merge commit 'a6727a33501ef4099d2e57c23553d284fb661280' as 'modules/de-common-module'

commit a6727a33501ef4099d2e57c23553d284fb661280
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:34 2014 -0700

    Squashed 'modules/de-common-module/' content from commit c270c59

    git-subtree-dir: modules/de-common-module
    git-subtree-split: c270c59b3cfb8b34205adb1e24e07dce5b3c0ba7

commit 67ac40453a58d1246cfafba5dfd7da52d8f51f3e
Merge: ef019d9 6863ff8
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:33 2014 -0700

    Merge commit '6863ff811cef0fee8f380272b92c30746671e980' as 'modules/confluence-client'

commit 6863ff811cef0fee8f380272b92c30746671e980
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:33 2014 -0700

    Squashed 'modules/confluence-client/' content from commit 15750c3

    git-subtree-dir: modules/confluence-client
    git-subtree-split: 15750c33081bbb4176380f30959573375eaf0673

commit ef019d9ff7908e23822b875193ccea1e80611c8a
Merge: 0900312 0cda39f
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:31 2014 -0700

    Merge commit '0cda39f0a2a19ee7b1c2065d5645b12cbeb7e4ca' as 'modules/clavin-Java'

commit 0cda39f0a2a19ee7b1c2065d5645b12cbeb7e4ca
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:31 2014 -0700

    Squashed 'modules/clavin-Java/' content from commit 83544aa

    git-subtree-dir: modules/clavin-Java
    git-subtree-split: 83544aabf1446c2fcdbdca4bf28efb470ab9a2b6

commit 0900312eb3e8f998512e57e3d769aaeec7686152
Merge: e71fd55 ce1a87b
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:28 2014 -0700

    Merge commit 'ce1a87b6fc3fe1090c01817be1a4455705daf2b4' as 'applications/belphegor'

commit ce1a87b6fc3fe1090c01817be1a4455705daf2b4
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 18:29:28 2014 -0700

    Squashed 'applications/belphegor/' content from commit 37b1c80

    git-subtree-dir: applications/belphegor
    git-subtree-split: 37b1c80247184b257b8cdc66f7c02d95d1594ee3