Changes during the Campus Party Santander...
Merge pull request #1 from telefonicaid/release/1.1.0

Changes during the Campus Party Santander... (@ralli @fla)