Changed java version to 1.7 so that cobertura works; moved cobertura report generation to different phase
Merge branch 'master' of github.com:Matkakuvapalvelu/Matkakuvapalvelu
Changed system.properties java version to 7