Goals updated
Merge branch 'master' of https://github.com/MSWL--2013-14/mswl-csii-2014

Unifying changes from other participants and the author.