Merge Development branch changes into master

All dev alterations including features, fixes and other changes seem to be stable enough to be in the next FlansMod release.