Login changes
Merge branch 'master' of
https://github.com/otisliddy/group-project-repo.git

Conflicts:
	group1-sprint2/src/main/java/com/ericsson/project/dao/CallFailureDAO.java
	group1-sprint2/src/main/java/com/ericsson/project/dao/ICallFailureDAO.java
	group1-sprint2/src/main/java/com/ericsson/project/ejbs/CallFailureEJB.java
	group1-sprint2/src/main/java/com/ericsson/project/importing/ImportData.java
	group1-sprint2/src/main/webapp/js/main.js
Merge branch 'master' of
https://github.com/otisliddy/group-project-repo.git

Conflicts:
	group1-sprint2/src/main/java/com/ericsson/project/dao/ICallFailureDAO.java
	group1-sprint2/src/main/java/com/ericsson/project/ejbs/ICallFailureEJB.java