AdBooker
* Fixed permissions not always allowing the setup button to be shown
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
AdBooker
* Fix for marketer targets not being captured
Merge branch 'WIP'

Conflicts:
	ui/ab/_js/page_reports_marketer_targets.js
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
Merge branch 'WIP'
removed NF from stable
Merge branch 'WIP'