change font color
change font color
Merge Branch_V1

Conflicts:
	src/main/webapp/login.js
Merge Branch_V1

Conflicts:
	src/main/webapp/login.js