add customerActive
Merge remote-tracking branch 'origin/master'
login
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/fjnu/foodvomitslot/service/CustomerServiceInte.java