config
Merge branch 'master' of https://github.com/surevine/neon
Changing java compliance to 1.6 as we regually make changes in an office where only java 1.6 is available
Merge branch 'master' of https://github.com/surevine/neon