fixed tests
ALM-697 gitignore cookbooks
Merge branch 'feature/ALM-709' into develop

Conflicts:
	.gitignore
	spec/mailers/report_mailer_spec.rb