Fixed merge. Ignored requirement manager.jar
Fixed merge