HowTo Merge BEXIS2 Core

1. Create new pull request
2. Use _compare across forks _ to select the right branch on both sides
3. Select bexis/yourbranch <- BExIS2/branchToMergeIntoYourBranch
4. Merge with GitHub if there are no conflicts
5. Otherwise, use the proposed git commands and solve the conflicts local with git tortoise. Then commit and push the changes to the temp branch which is created by GitHub pull request. The merge will be automatically accepted by GitHub.