fix typo variable error in Columns filter
fix php error on absent m2mfield variable
Merge branch 'master' of github.com:JojoCMS/Jojo-CMS