Commit con errores
Category, Element, UserElement
Merge branch 'play-api-develop-luis' into play-api-develop-wayo

Conflicts:
	projectFilesBackup/.idea/libraries/SBT__org_scala_lang_scala_library_2_11_1.xml