merge the latest changes before the migration to the new meanjs.org boilerplate structure