revert forced collation removal
Merge branch 'master' of git://github.com/FoolCode/FoolFrame into develop