login going through the database now - need to add registration functionality
working on adding registration. might merge with JSF config branch
jsf works now.
fixing flow
removing unnecessary things
modifying .gitignore
Merge branch 'feature-JSFConfig' into develop

Adding JSF configurations to develop
Merge branch 'develop' into feature-loginAuthenticationHandler

Conflicts:
	src/main/resources/META-INF/spring/applicationContext-security.xml
	src/main/webapp/WEB-INF/i18n/messages.properties
	src/main/webapp/WEB-INF/views/login.jspx
	src/main/webapp/WEB-INF/views/views.xml

Fixing JSF configurations with Spring Security
login fully works, with authorities as well.
creating registration flow to check auth
working on registration process to handle salting;
trying to get autocomplete to work
registration is working with salted passwords. now i need login to pick up that salt...
login and registration work completely
login and registration work completely
Merge branch 'feature-loginAuthenticationHandler' of github.com:atyagi/SurgeryAssist into feature-loginAuthenticationHandler

Conflicts:
	src/main/webapp/WEB-INF/config/security-config.xml
Merge branch 'feature-loginAuthenticationHandler' into develop
Merge branch 'develop' into feature-search

Conflicts:
	.gitignore
	src/main/webapp/WEB-INF/i18n/application.properties
	src/main/webapp/WEB-INF/i18n/messages.properties
	src/main/webapp/WEB-INF/views/menu.jspx