Merge pull request #1650 from colemanw/master

CRM-13313 - Payments - prevent fatal error when line-item has no price set
CRM-12464 - Pseudoconstant::get - fix context/onlyActive

----------------------------------------
* CRM-12464:
  http://issues.civicrm.org/jira/browse/CRM-12464