Upgrading project to 2.3.5 from https://code.google.com/p/jforum2/
Merge branch 'master' of https://github.com/extenditus/jforum2