Lot of different changes.
Fixed merge conflicts b/w home & work branches.
Fixed merge conflicts b/w home & work branches pt. 2.