Merge pull request #190 from apmuthu/master

Excel Export and Excel Zipped Export fixed
Merge pull request #193 from apmuthu/master

#191 - Japanese Language set to disabled as not fully translated
Starting on 3.1.1
Merge pull request #2 from benkeen/master

Merge with Upstream