susunan organisasi
Merge branch 'master' of https://github.com/sharonrh/SIOUI

Conflicts:
	SIOUIbackend/nbproject/project.properties
	SIOUIbackend/web/WEB-INF/web.xml
	nbproject/private/private.properties
Merge branch 'master' of https://github.com/sharonrh/SIOUI