Fix POM files for building project from main POM
Fix admin-centre pom file for building project from main POM
Merge remote-tracking branch 'origin/master'