Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	assets/js/pages/beoro_datatables.js
	assets/js/pages/beoro_form_elements.js
	nbproject/private/private.properties