Removed unnecessary currentProgramYear and currentProgramMonth.
Removed unnecessary currentProgramYear and currentProgramMonth.
Merge branch 'vireo_undergrad_sprint1_bo1988_programdate' of https://github.com/TAMULib/Vireo into vireo_undergrad_sprint1_bo1988_programdate

Conflicts:
	app/org/tdl/vireo/security/impl/ShibbolethAuthenticationMethodImpl.java
Removed lingering currentProgramMonth and currentProgramYear attributes.
Fixed issue where ProgramMonth wasn't being selected in the form field after saving.
Merge branch 'vireo_undergrad_sprint1' into vireo_undergrad_sprint1_bo1988_programdate

Conflicts:
	app/org/tdl/vireo/model/jpa/JpaPersonImpl.java
	conf/application.conf
	test/org/tdl/vireo/model/MockPerson.java
Merge branch 'vireo_undergrad_sprint1_bo1988_programdate' into vireo_undergrad_sprint1
Merge branch 'tamu_production' into vireo_undergrad_sprint1

Conflicts:
	app/org/tdl/vireo/model/jpa/JpaPersonImpl.java
	test/org/tdl/vireo/model/MockPerson.java
Merge branch 'vireo_undergrad_sprint1' into tamu_production