Bring WhiteCore repo up to date with the main WhiteCore/WhiteCore-Dev repo as of August 21, 2014