Cleanup and formatting#442

arjantijms merged 5 commits into

javaee-samples:masterjavaee-samples/javaee7-samples:masterfrom

Pandrex247:Cleanup-And-FormattingPandrex247/patched-src-javaee7-samples:Cleanup-And-FormattingCopy head branch name to clipboard