modified changelog
Merge branch 'master' of https://github.com/GorioB/uftrs-app