11/21/2014 sync Model branch with Controller branch for Garner meeting