added project compliance with java 1.7
Merge branch 'jstylo_master' into TD_Jstylo