Pegawai toko dkk progres 50%
Merge branch 'master' of https://github.com/initrunlevel0/SimplePOS2013_Gudang

Conflicts:
	src/main/webapp/WEB-INF/views/pegawai_toko.html