Added New Modules and Templates
Conflict

Merge branch 'master' of https://github.com/thepixelworx/drupal