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