Development Puppet File
Testing Puppetfie
Merge branch 'development'

Conflicts:
	Puppetfile
changed filebucket hostname
Merge branch 'development' into testing
Merge branch 'testing' into production
Merge branch 'production'
synchronizing the control module