jsp menus permisos y actions
Merge branch 'master' of https://github.com/mclo/UNLPActivities.git

Conflicts:
	src/main/java/ttps/model/model.ucls
	src/main/java/ttps/repository/Repository.ucls