cu4 testing finished
Merge branch 'master' of github.com:jabotta/ProgApp2014
Merge branch 'master' of github.com:jabotta/ProgApp2014