Pass variables to template
Merge branch 'pass-template-variables' into develop

Conflicts:
	recipes/mod_rails.rb