updated model with associations, deleted old model, added prototype of new action
Merged with origin
fixed project status