prova conflitto marco
Merge branch 'master' of https://github.com/rotz87/ing_test.git

Conflicts:
	BookmarkExample/src/controller/SimpleCORSFilterController.java