theshruj adds stuff
fixed the display of not updated values
Merge origin/master

Conflicts:
	web/js/customerTableButton.js