Changing POM file - Setting maven java version 1.6
Merge remote-tracking branch 'origin/master'