MFB: Add several changes from PMF_1_6: revision id etc etc
MFB: Add several changes from PMF_1_6: revision id etc etc


rogeriopradoj/phpMyFAQ-vagrant,brianjking/phpMyFAQ,Chris--A/phpMyFAQ,Chris--A/phpMyFAQ,thorsten/phpMyFAQ,brianjking/phpMyFAQ,brianjking/phpMyFAQ,brianjking/phpMyFAQ,rogeriopradoj/phpMyFAQ-vagrant,rogeriopradoj/phpMyFAQ-vagrant,thorsten/phpMyFAQ,Chris--A/phpMyFAQ,thorsten/phpMyFAQ,rogeriopradoj/phpMyFAQ-vagrant,thorsten/phpMyFAQ,Chris--A/phpMyFAQ