Merged local changes with latest commit

Left area in read to show error message, changed button text in
settings, changed method of populating year popup box in read, added
form for edit role button click event