Shortener tutorial
Merge branch 'master' of https://github.com/UNIZAR-30246-WebEngineering/2014-2015.git