Synchronize modules in the main branches

Created by: lpalgarvio

There is a discrepancy of modules in the two main branches: master and stable.

This needs to be fixed in order to proceed with testing.

Imported comments:

By lpalgarvio on 2013-06-14 04:05:20+00:00

Upgrade modules has been delayed -> testing & upgrade drupal core

By lpalgarvio on 2013-08-06 02:40:57+00:00

after re-organization of modules and themes, new changes pending

By lpalgarvio on 2013-08-06 02:41:16+00:00

discarded stable, commits attached to master