Fix relations and add controller actions
Merge branch 'master' of github.com:SongSync/SongSync