Merge remote-tracking branch 'dunparatu/console-linewrap-issues'
Merge branch 'develop'
Update CHANGELOG.md
prep repo for automating build, moving sln into src folder
Merge remote-tracking branch 'erendrake/src_folder' into develop
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop' of github.com:KSP-KOS/KOS into develop
Merge remote-tracking branch 'origin/develop' into develop