Restore Update Apache
Merge branch 'master' of github.com:igui-br/opsworks-cookbooks

Conflicts:
	deploy/recipes/php.rb
	mod_php5_apache2/recipes/php.rb
	mod_php5_apache2/specs/default_spec.rb
	mod_php5_apache2/specs/php_spec.rb

	modified:   deploy/recipes/php.rb
	modified:   mod_php5_apache2/recipes/php.rb
	modified:   mod_php5_apache2/specs/default_spec.rb
	modified:   mod_php5_apache2/specs/php_spec.rb