Merge branch 'master' into Dustin
Adjustments and asset protection saving to db
Merge branch 'Dustin'