KAMAR AND HOTEL
Merge branch 'master' of ssh://git@github.com/wahyudin/PRTI.git

Conflicts:
	SIPTU/WebContent/WEB-INF/faces-config.xml