Bay Merge 01DEC2014

A lot of things v.v