Session Management Part 2
Merge branch 'origin/master'

Conflicts:
	SchedulerWeb/src/main/java/com/scheduler/controllers/OfficialController.java
	SchedulerWeb/src/main/webapp/WEB-INF/classes/application.properties