Merge commit '36fd783caf9684c75c04bafdee90bbbfce045d08'

Conflicts:
	modules/btsync/manifests/shared_folder.pp
	modules/btsync/templates/shared_folder.erb
Remove unused template header.erb
Add some missing parameters in globals.erb
Declare instance shared_folders concat_build at first shared_folder resource declaration
Don't use *.tmp order for instance concat_build
File[$conffile] depends on Concat_build["instance_${name}"]