which caused UnboundLocalError.  Added tests for this case

Conflicts:
	common/djangoapps/external_auth/tests/test_shib.py

Conflicts:
	lms/djangoapps/django_comment_client/utils.py
	lms/envs/common.py

- changed background color of icon area
- added forced focus call on candy ID to prevent page from moving past top of chat
- increased size of text field
- added margin to right of message pane because text was sometimes hidden on long posts when a scrollbar was present

After a period of inactivity, users will be disconnected from the
chat server. By default, Candy.js prompts them for a username and
password in order to reconnect. However, since we've generated both
of these for the user, they don't know what their username and
password are, and we can just reconnect them automatically.

Therefore, we don't want Candy.js to ever display a login form.
Instead, we override the `showLoginForm` function to display a
notification and a button to click when the user is ready to
reconnect to the chat server.

- changed background color of icon area
- added forced focus call on candy ID to prevent page from moving past top of chat
- increased size of text field
- added margin to right of message pane because text was sometimes hidden on long posts when a scrollbar was present

Without this, problems fail to load because they can't find how to
render themselves, and the certificate generation grading run will
get an inaccurately low count of the possible points a user could
get (anything they didn't see will be omitted), inflating their
grade during certificate calculation and making it inconsistent
with their Progress page.

Merge branch 'edx-west/release-20130617-candidate' of github.com:edx/edx-platform into edx-west-release-candidate-20130617

For embedding chat in a course, user testing shows a course tab is
preferable to the slideout thing, and simpler to implement, so this
commit reverts courseware changes.  Instead, embed chat by creating a
new course tab and setting it's HTML to look like this:

  <iframe src="/courses/COURSE_ID_HERE/chat" width="100%" height="640px"
          style="border: 1px solid #c4bfab; border-radius: 5px;"></iframe>

Conflicts:

	lms/templates/courseware/courseware.html

Feature/brian/regrade celery 2

When chat is enabled, we need to add the Jabber Django app's static
asset and template directories to the corresponding lookup paths.

When chat is enabled, we need to add the Jabber Django app's static
asset and template directories to the corresponding lookup paths.

* Fix chatroom to use the calculated course room, rather than the
  testing-only 'dev' room.
* Install new version of candy.min.js compiled with an Aria tag for the
  input box (see also:
  https://github.com/jrbl/candy/tree/input-accessibility-improvement)

Co-authored-by: Giulio Gratta <caeser2164@gmail.com>
Co-authored-by: Nate Hardison <natehardison@gmail.com>

Cherry pick change to url matching regular expression. Fixes LMS-37

remove assets.js from the PIPELINE_JS since it seems to cause that file ...

To beat the "booty call" bug, whereby starting a private chat makes
the recipient believe that they've been taken into a private room
(when in fact they're still in the group room), we're resetting all
of the Candy static assets to the stock resources.

Override user agent CSS default on message input

The default Candy CSS doesn't do a very good CSS reset, so in this
case, the user agent stylesheet put a margin in the message form,
pushing the input box up a bit. Set the margin to 0 so that things
look normal.

Moving the Jabber widget to its own iframe allows us to pop it out
and in of the courseware. Refactoring more of the code (static
assets, templates, etc.) keeps the Jabber app more self-contained
so that it doesn't clutter up the main repo code.

This code needs some Jasmine tests and view tests. It also needs
some extra configuration in the settings and URLs files, namely:

* Must add jabber/templates to MAKO_TEMPLATES
* Must add jabber/static to STATICFILES_DIRS
* Must add route for ?P<course_id>/chat to lms/urls.py

Move Candy.js static assets to Jabber app

Refactor the Candy.js static assets to the Jabber app to keep them
out of the main codebase. This will help modularize the chat widget
so that it's easier to just not include it by default, if desired.

Move registered_for_course out of courseware.views

The Jabber app needs to use this function, and it seems more fitting
to import the function from a non-view module, like the courses
module. So move that function there, and update imports and tests
appropriately.

Now that the Jabber settings functionality is refactored into its
own Django app, we don't need this test in the Courseware Django
app.

Rename get_password_for_user to get_or_create_...

The new name describes more accurately what the function does: it
creates a new password for the user if it can't find one in the
database.

Move DEFAULT_PASSWORD_LENGTH to JabberUser model

This seems more appropriate as a property of the model as opposed
to a loose constant in the utils module.

Random string generation returns proper length

Before, the length was only accurate if it was a multiple of four.
Now, we calculate the number of bytes needed from /dev/urandom
properly and we truncate the string to just the right length.
(Base64 returns strings that are a multiple of four in length, but
we truncate since we won't ever care to decode the string.)

Adding working utility tests for Jabber app

The majority of the functionality of the Jabber app is in the utils
module, so we test those functions thoroughly.

The test settings don't currently have settings to connect to a
Jabber database (need @jrbl's help to get the migration files to set
it up properly), so we temporarily skip tests that hit the Jabber
users table.

Add migration for Jabber users table for testing

In testing environments, we want to be able to interact with the
database as we create JabberUser instances. This commit adds a
migration for the purposes of testing; the migration should *not*
be used for anything else though. The actual Jabber users table
should be created by ejabberd during provisioning.

Unskip Jabber tests that interact with database

Now that we have a migration for the Jabber users table in the test
environment, we can hook it up in test and "unskip" the tests that
hit that table.

If no default is provided, sass falls back to the system
default. This fails when the system default is not unicode because
various sass files have unicode characters in them.

As stipulated by Stanford's office of general counsel

By linking the users

modification of @jrbl's version to handle a dict with value None

(cherry picked from commit 14100ba1)

(cherry picked from commit 832da3ad)

(cherry picked from commit 050846af)

(cherry picked from commit 664efb98)

(cherry picked from commit a17bf5e2)