Updated the default IDEA project files to IDEA 13
Merge branch 'master' into jdk7