fix conflicts
BS-9374
File and URL fields must be mandatory in ADD popup
test document validation
ignore auto generated code classpath
fix conflicts
fix conflicts