users con links
Merge remote-tracking branch 'origin/master'

Conflicts:
	informer-server/informer-api/src/main/java/eetac/upc/edu/dsa/dsaqt1314g2/informer/api/links/UsersAPILinkBuilder.java