changed model associations
Merge branch 'master' of github.com:toodelirious/StereoSpace
models update