фигня
фигня
Merge origin/master

Conflicts:
	target/classes/UrlMappings$__clinit__closure1.class
	target/classes/UrlMappings.class
	target/classes/fitnessapp/AthleteCCategoryController$_$tt__delete_closure14.class
	target/classes/fitnessapp/AthleteCCategoryController$_$tt__save_closure11.class
	target/classes/fitnessapp/AthleteCCategoryController$_$tt__save_closure12.class
	target/classes/fitnessapp/AthleteCCategoryController$_$tt__update_closure13.class
	target/classes/fitnessapp/AthleteCCategoryController$_notFound_closure8.class
	target/classes/fitnessapp/AthleteCCategoryController$_notFound_closure8_closure15.class
	target/classes/fitnessapp/AthleteCCategoryController$_notFound_closure8_closure16.class
	target/classes/fitnessapp/AthleteCCategoryController$_tt__delete_closure14_closure21.class
	target/classes/fitnessapp/AthleteCCategoryController$_tt__delete_closure14_closure22.class
	target/classes/fitnessapp/AthleteCCategoryController$_tt__save_closure12_closure17.class
	target/classes/fitnessapp/AthleteCCategoryController$_tt__save_closure12_closure18.class
	target/classes/fitnessapp/AthleteCCategoryController$_tt__update_closure13_closure19.class
	target/classes/fitnessapp/AthleteCCategoryController$_tt__update_closure13_closure20.class
	target/classes/fitnessapp/AthleteCCategoryController.class
	target/stacktrace.log