Token, pathauto added + menu fix
Merge branch 'master' of github.com:bstrx/plus