perubahan model, tapi web pages belom dibenerin semua
Merge branch 'master' of https://github.com/sharonrh/SIOUI

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties