Merge remote branch 'origin/classpages' into classpages-2
squash commit to allow rebasing against dev again
* origin/classpages: (134 commits)
  Merge remote branch 'origin/classpages' into classpages-2 squash commit on new branch so I can rebase again * origin/classpages: (133 commits)   NOJIRA - cleaning out trailing whitespaces   MYB-1622 - fleshing out more parameter values   MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion   MYB-1622 - minor fix   MYB-1622 bringing up the secion_instructors part   MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json   MYB-1622 - trying to get the tidy selector and json extension to work   MYB-1622 - version working with sections provision   MYB-1622 - bringin up sections   MYB-1622 more sections part work   MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors   MYB-1622 - reworking quotes on fields and minor fixes   MYB-1622 - bringing up the instructors part of the JSON   NOJIRA - cleaning up a little more whitespace after finally successful rebase   NOJIRA - whitespace fix   MYB-1622 - fixes for setting unused tokens to false   NOJIRA - squash commit to get clean branch for rebasing dev   ...
  NOJIRA - cleaning out trailing whitespaces
  MYB-1622 - fleshing out more parameter values
  MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query
  MYB-1622 - adding romm and schddule info - needs further work
  MYB-1622 - adding romm and schddule info - needs further work
  MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion
  MYB-1622 - minor fix
  MYB-1622 bringing up the secion_instructors part
  MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json
  MYB-1622 - trying to get the tidy selector and json extension to work
  MYB-1622 - version working with sections provision
  MYB-1622 - bringin up sections
  MYB-1622 more sections part work
  MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors
  MYB-1622 - reworking quotes on fields and minor fixes
  MYB-1622 - bringing up the instructors part of the JSON
  NOJIRA - cleaning up a little more whitespace after finally successful rebase
  NOJIRA - whitespace fix
  MYB-1622 - fixes for setting unused tokens to false
  ...
NOJIRA - squash commit into new MYB-1383 to allow rebasing again

Merge branch 'MYB-1383-merges' into MYB-1383

* MYB-1383-merges:
  MYB-1383 - updating configs and adding missing configs to enable hybrid in all environments except localhost where it is turned off in env.localhost.js
  MYB-1383 - need to use CAS proxy tickets for Hybrid
  MYB-527 - adding back hybrid configs that got steeped on at some point
MYB01383 - making special 1.2-HYBRID-SNAPSHOT version to avoid getting stepped on my reinstall.sh
Merge remote-tracking branch 'origin/classpages' into classpages

* origin/classpages:
  Merge remote branch 'origin/classpages' into classpages-2 squash commit to allow rebasing against dev again * origin/classpages: (134 commits)   Merge remote branch 'origin/classpages' into classpages-2 squash commit on new branch so I can rebase again * origin/classpages: (133 commits)   NOJIRA - cleaning out trailing whitespaces   MYB-1622 - fleshing out more parameter values   MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion   MYB-1622 - minor fix   MYB-1622 bringing up the secion_instructors part   MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json   MYB-1622 - trying to get the tidy selector and json extension to work   MYB-1622 - version working with sections provision   MYB-1622 - bringin up sections   MYB-1622 more sections part work   MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors   MYB-1622 - reworking quotes on fields and minor fixes   MYB-1622 - bringing up the instructors part of the JSON   NOJIRA - cleaning up a little more whitespace after finally successful rebase   NOJIRA - whitespace fix   MYB-1622 - fixes for setting unused tokens to false   NOJIRA - squash commit to get clean branch for rebasing dev   ...   NOJIRA - cleaning out trailing whitespaces   MYB-1622 - fleshing out more parameter values   MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion   MYB-1622 - minor fix   MYB-1622 bringing up the secion_instructors part   MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json   MYB-1622 - trying to get the tidy selector and json extension to work   MYB-1622 - version working with sections provision   MYB-1622 - bringin up sections   MYB-1622 more sections part work   MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors   MYB-1622 - reworking quotes on fields and minor fixes   MYB-1622 - bringing up the instructors part of the JSON   NOJIRA - cleaning up a little more whitespace after finally successful rebase   NOJIRA - whitespace fix   MYB-1622 - fixes for setting unused tokens to false   ...
Merge remote branch 'origin/classpages' into classpages-2
squash commit to allow rebasing against dev again
* origin/classpages: (134 commits)
  Merge remote branch 'origin/classpages' into classpages-2 squash commit on new branch so I can rebase again * origin/classpages: (133 commits)   NOJIRA - cleaning out trailing whitespaces   MYB-1622 - fleshing out more parameter values   MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion   MYB-1622 - minor fix   MYB-1622 bringing up the secion_instructors part   MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json   MYB-1622 - trying to get the tidy selector and json extension to work   MYB-1622 - version working with sections provision   MYB-1622 - bringin up sections   MYB-1622 more sections part work   MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors   MYB-1622 - reworking quotes on fields and minor fixes   MYB-1622 - bringing up the instructors part of the JSON   NOJIRA - cleaning up a little more whitespace after finally successful rebase   NOJIRA - whitespace fix   MYB-1622 - fixes for setting unused tokens to false   NOJIRA - squash commit to get clean branch for rebasing dev   ...
  NOJIRA - cleaning out trailing whitespaces
  MYB-1622 - fleshing out more parameter values
  MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query
  MYB-1622 - adding romm and schddule info - needs further work
  MYB-1622 - adding romm and schddule info - needs further work
  MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion
  MYB-1622 - minor fix
  MYB-1622 bringing up the secion_instructors part
  MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json
  MYB-1622 - trying to get the tidy selector and json extension to work
  MYB-1622 - version working with sections provision
  MYB-1622 - bringin up sections
  MYB-1622 more sections part work
  MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors
  MYB-1622 - reworking quotes on fields and minor fixes
  MYB-1622 - bringing up the instructors part of the JSON
  NOJIRA - cleaning up a little more whitespace after finally successful rebase
  NOJIRA - whitespace fix
  MYB-1622 - fixes for setting unused tokens to false
  ...
MYB-1622 - updating version and adding module
MYB-1696, MYB-1622 - updating version for further work
MYB-1622 - changing the database connection lifecycle
Merge branch 'classpages' of github.com:ets-berkeley-edu/myberkeley into classpages

* 'classpages' of github.com:ets-berkeley-edu/myberkeley:
  MYB-1622 - changing the database connection lifecycle
  MYB-1696, MYB-1622 - updating version for further work
  MYB-1622 - updating version and adding module
  Merge remote branch 'origin/classpages' into classpages-2 squash commit to allow rebasing against dev again * origin/classpages: (134 commits)   Merge remote branch 'origin/classpages' into classpages-2 squash commit on new branch so I can rebase again * origin/classpages: (133 commits)   NOJIRA - cleaning out trailing whitespaces   MYB-1622 - fleshing out more parameter values   MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion   MYB-1622 - minor fix   MYB-1622 bringing up the secion_instructors part   MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json   MYB-1622 - trying to get the tidy selector and json extension to work   MYB-1622 - version working with sections provision   MYB-1622 - bringin up sections   MYB-1622 more sections part work   MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors   MYB-1622 - reworking quotes on fields and minor fixes   MYB-1622 - bringing up the instructors part of the JSON   NOJIRA - cleaning up a little more whitespace after finally successful rebase   NOJIRA - whitespace fix   MYB-1622 - fixes for setting unused tokens to false   NOJIRA - squash commit to get clean branch for rebasing dev   ...   NOJIRA - cleaning out trailing whitespaces   MYB-1622 - fleshing out more parameter values   MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion   MYB-1622 - minor fix   MYB-1622 bringing up the secion_instructors part   MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json   MYB-1622 - trying to get the tidy selector and json extension to work   MYB-1622 - version working with sections provision   MYB-1622 - bringin up sections   MYB-1622 more sections part work   MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors   MYB-1622 - reworking quotes on fields and minor fixes   MYB-1622 - bringing up the instructors part of the JSON   NOJIRA - cleaning up a little more whitespace after finally successful rebase   NOJIRA - whitespace fix   MYB-1622 - fixes for setting unused tokens to false   ...
  Merge remote branch 'origin/classpages' into classpages-2 squash commit to allow rebasing against dev again * origin/classpages: (134 commits)   Merge remote branch 'origin/classpages' into classpages-2 squash commit on new branch so I can rebase again * origin/classpages: (133 commits)   NOJIRA - cleaning out trailing whitespaces   MYB-1622 - fleshing out more parameter values   MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion   MYB-1622 - minor fix   MYB-1622 bringing up the secion_instructors part   MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json   MYB-1622 - trying to get the tidy selector and json extension to work   MYB-1622 - version working with sections provision   MYB-1622 - bringin up sections   MYB-1622 more sections part work   MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors   MYB-1622 - reworking quotes on fields and minor fixes   MYB-1622 - bringing up the instructors part of the JSON   NOJIRA - cleaning up a little more whitespace after finally successful rebase   NOJIRA - whitespace fix   MYB-1622 - fixes for setting unused tokens to false   NOJIRA - squash commit to get clean branch for rebasing dev   ...   NOJIRA - cleaning out trailing whitespaces   MYB-1622 - fleshing out more parameter values   MYB-1622 - adding scheule handlers and adding missing schedule attributes to the OracleClassPageContainerAttributeProvider superclass as we now use the superclass for schedule data as it can use the same query   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - adding romm and schddule info - needs further work   MYB-1622 - more work on schedule rendering and error handling including refactoring schedule attribute expansion   MYB-1622 - minor fix   MYB-1622 bringing up the secion_instructors part   MYB-1622 - updating template to match Scot's authoritative json at 3akai-ux/devwidgets/ccclassinfo/courseinfo.json   MYB-1622 - trying to get the tidy selector and json extension to work   MYB-1622 - version working with sections provision   MYB-1622 - bringin up sections   MYB-1622 more sections part work   MYB-1622 - renaming PrimaryInstructor classes to differentialte from all sections instructors   MYB-1622 - reworking quotes on fields and minor fixes   MYB-1622 - bringing up the instructors part of the JSON   NOJIRA - cleaning up a little more whitespace after finally successful rebase   NOJIRA - whitespace fix   MYB-1622 - fixes for setting unused tokens to false   ...
[MYB-1719] Fix for separate solr server for 1.4
NOJIRA Deal with version change to Solr-integration bundle
Merge branch 'MYB-1383' into dev-myb-1383

Changing special version of 3akai-ux to 1.4.0-SNAPSHOT in preparation for a release

* MYB-1383:
  MYB01383 - making special 1.2-HYBRID-SNAPSHOT version to avoid getting stepped on my reinstall.sh
  NOJIRA - squash commit into new MYB-1383 to allow rebasing again

Conflicts:
	launchpad/pom.xml
MYB-1635, added back the text 'is running' to line 121
[NOJIRA] Tabs are evil. Shoot old yuhung for not configuring his dev enviroment to not use tabs
[MYB-1167] Troublesome hybrid sites migrator that has a few dozen tests to verify it SHOULD work:  https://github.com/yuhunglin/myberkeley/tree/dataCleanupUtil
[MYB-1795] Updated migrator to guestimate the sakai2sites lhnavigation item from index 3->2
MYB-1768 Tag migration script
MYB-1768 Lowercase unofficial tag replacements of obsolete categories
MYB-1809 - removed obsolete variable config.hybridCasHost
Merge branch 'dev' into ilasspages
Bringing up to 1.4
* dev:
  MYB-1809 - removed obsolete variable config.hybridCasHost
  MYB-1768 Lowercase unofficial tag replacements of obsolete categories
  MYB-1768 Tag migration script
  [MYB-1795] Updated migrator to guestimate the sakai2sites lhnavigation item from index 3->2
  [MYB-1167] Troublesome hybrid sites migrator that has a few dozen tests to verify it SHOULD work:  https://github.com/yuhunglin/myberkeley/tree/dataCleanupUtil
  [NOJIRA] Tabs are evil. Shoot old yuhung for not configuring his dev enviroment to not use tabs
  MYB-1635, added back the text 'is running' to line 121
  NOJIRA Deal with version change to Solr-integration bundle
  [MYB-1719] Fix for separate solr server for 1.4
  MYB01383 - making special 1.2-HYBRID-SNAPSHOT version to avoid getting stepped on my reinstall.sh
  NOJIRA - squash commit into new MYB-1383 to allow rebasing again