datatable issue
Merge remote-tracking branch 'origin/36.0basic-coding-acl' into UAT

Conflicts:
	nbproject/private/private.xml
show page info
Merge remote-tracking branch 'origin/UAT' into 49.1-sales-campaign-type-sponsoring
Sponsoring type

Sponsoring type
Sponsoring type

Sponsoring type
Sponsoring campaign

Sponsoring campaign
Coreg and sponsoring

Coreg and sponsoring
Coreg campaign answers

Coreg campaign answers
Dynamic answers

Dynamic answers
Generalization of code

Generalization of code
Coreg campaign

Coreg campaign
Conflict resolved

Conflict resolved