Now uses java 1.6

There was no reason to use 1.7
Merge branch 'master' of https://github.com/soosterwaal/operias

Conflicts:
	src/main/java/operias/Main.java