resolving some more merge conflicts
resolving some more merge conflicts

taskadapter/redmine-java-api,redminenb/redmine-java-api,stephenc/redmine-java-api,redminenb/redmine-java-api,sleroy/redmine-java-api,taskadapter/redmine-java-api,sleroy/redmine-java-api