Merge branch 'develop' of github.com:fishlamp/FishLamp into develop
Merge branch 'develop' of github.com:fishlamp/FishLamp into develop

Conflicts:
	README.md
imported files from FishLamp
imported files from FishLamp
imported files from monolith
imported files from "FishLamp-Objc-CommandLineProcessor"
imported files from "FishLampUI"
imported files from "FishLampOSX"
imported files from "PackMule"
imported files from "fishlamp-codegenerator"
update after removing OSX prerelease
fixing build
imported files from "FishLampPrerelease"
add podspec