Merge dev into master, releaseable state

File is presentation ready and will be packaged/tested. further changes can be made, but this is meant to be stable.