in some cases the git protocol cannot be processed (port blocking or other reasons) with https it should work for everyone
Build correct path on image upload when config has custom content path

closes #2563
- build path relative to imagesPath (which contains the custom content path)
  instead of appRoot
- added test for custom content path
- added logic to tests for Windows url building to handle cases where Windows
  functionality is being tested on a unix operating system
Merge pull request #2552 from hschaeidt/master

in some cases the git protocol cannot be processed
Merge pull request #2566 from jaswilli/fix/issue-2563

Build correct path on image upload when config has custom content path
Refactor the API route tests to use supertest

close #2443
- Refactor API tests from `/core/test/functional/api` to
  `/core/test/functional/routes/api`, using supertest instead of request
- Remove `core/test/functional/api` folder
Removing test-api from Gruntfile.js

closes #2443
Merge pull request #2512 from surgesoft/issue-2443
OSX shortcut fix.

closes #2573
- separate different shortcuts by OS detection in markdownEditor.js
Merge pull request #2574 from LazyChild/issue-2573

OSX shortcut fix.