Code formatting.
Code formatting for Java 6.
Merge branch 'master' of github.com:tehapo/Clara