basic templating
resolved router conflict
added fixtures and fixed remaining collections (except users)