updated factory class with exceptions, updated rest class
Merge branch 'master' of https://github.com/mschuebel/framework