start refactoring
bugfixes
minor fixes
updated tests
added the only_related flag to models
updated tests
Merge branch 'feature/newurls' into develop