Changed the project JRE to version 6 (Android development only supports Java 1.6). See the wiki ('Before you start') for configuration details.
Merge branch 'master' of git@github.com:tATAmI-Project/tATAmI-PC.git