Merge pull request #446 from shutter111/development

F56 Fixed package conflict bug
Merge pull request #447 from shutter111/development

F56 Build and Price. Bunch of updates!
small bug fixes