Merging with dev
stuff
Updated model with BP bcs
Added BP bc's
Minor fix in physics
merged with jake