Add tasks from 14.03
Merge branch 'master' of https://github.com/PuloV/sdp-pm14