Ajay | #4092 | Bugfix - Added line break to popup message
Ajay | #4101 | Bugfix - updated error message
Merge branch '15_0_release' into develop

Conflicts:
	datawinners/locale/fr/LC_MESSAGES/django.po