Merge branch 'master' of github.com:fishlamp/FishLampCore
Merge branch 'master' of github.com:fishlamp/iOS
Merge branch 'master' of github.com:fishlamp/OSX
merging in Core
Merge branch 'develop' of github.com:fishlamp/FishLamp into develop
Merge branch 'develop' of github.com:fishlamp/FishLamp into develop

Conflicts:
	README.md
move codegenerator into main repo
moving around
remove Old-
move, add projects
imported files from monolith