Release/2.6

merge release 2.6 with develop.  This contains all of the features that were checked in to pg-dev master branch on March 9, 2013.  It is compatible with webwork 2.7 (formerly 2.5.1.3).