[bknr-ticket] #11: Clean up branches and merge

#11: Clean up branches and merge ---------------------+------------------------------------------------------ Reporter: hhubner | Owner: hhubner Type: defect | Status: new Priority: major | Milestone: bknr-reloaded Component: bknr | Version: Keywords: | ---------------------+------------------------------------------------------ Merge bknr-trunk-reorg and BOS branches. Remove branches that are no longer needed.