Merge branch 'beta'
3.1_01

fixed massive error regarding NPE, and updated the compiling standard
to 1.7
Merge pull request #19 from iFlyCode/master

Merge for Consistency.