priyank : 7.37 pm
Merge branch 'master' of
https://github.com/obulikarthikeyan/SafeMoneyCorp

Conflicts:
	WebContent/pages/shared/otpValidator.jsp
	src/edu/asu/safemoney/controller/LoginController.java