Merged with Priyank
Merge branch 'master' of
https://github.com/obulikarthikeyan/SafeMoneyCorp.git

Conflicts:
	WebContent/WEB-INF/config/spring-servlet.xml
	WebContent/pages/external/transactionReview.jsp
	WebContent/pages/shared/signup.jsp
	src/edu/asu/safemoney/dao/EmployeeUserDAO.java
	src/edu/asu/safemoney/dao/impln/EmployeeUserDAOImpl.java
	src/edu/asu/safemoney/dao/impln/LoginDAOImpl.java
	src/edu/asu/safemoney/dao/impln/ManageExternalUserAccountDAOImpl.java
	src/edu/asu/safemoney/helper/PKICertificateHelper.java
	src/edu/asu/safemoney/model/UserModel.java
	src/edu/asu/safemoney/service/AdminUserService.java
	src/edu/asu/safemoney/service/EmployeeUserService.java
	src/edu/asu/safemoney/service/impln/AdminUserServiceImpl.java
	src/edu/asu/safemoney/service/impln/LoginServiceImpl.java
	src/edu/asu/safemoney/service/impln/ManageExternalUserAccountServiceImpl.java