Merge branch 'master' of
ssh://git@github.com/OurSourceCode/ManagementDataAbsensiFingerprint.git

Conflicts:
	ManagementDataAbsensiFingerprint/WebContent/login.xhtml
Merge branch 'master' of
ssh://git@github.com/OurSourceCode/ManagementDataAbsensiFingerprint.git
Merge branch 'master' of
ssh://git@github.com/OurSourceCode/ManagementDataAbsensiFingerprint.git