Pull request for merging dev into staging ( #1721 bug fixes, nose test, perma_link in resource extras ) - sprint 41