Updating beans to conform to muraORM api
Merge branch 'develop'