Added missing var declarations and fixed some join table errors
Merge branch 'master' of https://github.com/zjoia/orchid-clasia