some fixes to now regenerated javadocs
trying to resolve merge conflict
Changed names of competences
Merge branch 'master' of https://github.com/Jrende/IV1201
Merge branch 'master' of https://github.com/Jrende/IV1201 into mysql_conf
Removed global, app