edited properties files and dropdown choices
Merge branch 'master' of https://github.com/martinsakac/pa165.git