remove json javaee 6 support - now everthing works with Vanilla JavaEE 7
Merge branch 'master' of https://github.com/mr678/conair.git