Edit Conference functionality
Merge branch 'master' of
https://github.com/sarvagyaj/cmpe273-project.git

Conflicts:
	src/main/java/edu/sjsu/conference/repository/ConferenceRepository.java