merge diff from 2014 March 09 to May 07 (gabrielecirulli)GH-pages --> (LjApps)master