Setting up SMTP functionality.
Merge branch 'feature/v2.0' of github.com:meedan/meedan-nurani into feature/v2.0
Adding default Nurani theme settings.
Merge branch 'feature/v2.0' of github.com:meedan/meedan-nurani into feature/v2.0

Conflicts:
	drupal/sites/all/themes/nurani/nurani.info