Merge User Prior & new prior framework branch into master

[tramsauer]

Framework and user prior changes merged and conflicts solved. Also, tests should be passing again.. still not complete.