irham: update kasir dan pelayan serta controller pelayan
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/kasir/index.html
	app/views/kasir/menu.html
	app/views/pelayan/index.html