Commit [4ee9d1]  Maximize  Restore  History

Merge fx-team to m-c

Victor Porof Victor Porof 2013-06-23