Merge pull request #35 from alvarolopez/stable/folsom

Reimplement the SSH key management.
quote category terms and encode location urls
Merge pull request #36 from EGI-FCTF/stable/folsom_rocci

quote category terms and encode location urls