Added email and url modules
Merge branch 'master' of https://github.com/bfr/drupalfi