Made a few, non-final changes to the Role class and modified dependent classes accordingly.
Modified gitignore file
Modified classpath file
Solved conflicts
Merge branch 'master' of https://github.com/patr7/conf-reg-sys

Conflicts:
	.classpath
	WebContent/login.jsp
	src/data/access/UserDA.java
	src/domain/model/User.java