Merge pull request #3386 from edx/hotfix/2014-04-17

Show full body when expanding inline forum thread
Merge branch 'release'
Render markup in inline threads on expand/collapse

This was a bug in 3af90ef.
Merge pull request #3389 from edx/hotfix/2014-04-17a

Render markup in inline threads on expand/collapse
Merge pull request #3392 from edx/release

Release
Update bok-choy page definitions
adding django admin command to change enrollment
fixing example
Wording for batch beta email add with autoenroll (LMS-2551)
grammar
Merge pull request #3366 from IONISx/missing-translations

Missing translations
Merge pull request #3385 from edx/adam/add-event

pass event to callback functions in membership.coffee (LMS-2547)
Added watchdog to Paver requirements
set reasonable SERVICE_VARIANT based on command line; ensure theme passed to coffeescript also;
Merge pull request #3387 from edx/zoldak/update_page_objects

Update bok-choy page definitions
remove theme_paths var, per @sefk
added jj to the author list
fixed retry invokation for calling setState

to successfully call a function with parameters by setTimeout,
it needs to be a function that will be called by setTimeout internally.

this patch actually enables multiple tries for calling the setState function.
fix class var; set SERVICE_VARIANT to lms by default if unset (helps "paver --help" work cleanly)
Merge pull request #3094 from yarko/yarko/fix-paver-env-assets

ensure SERVICE_VARIANT set; pass theme to coffeescript;