props
Merge branch 'master' of https://github.com/JsFlo/SchedulingAppointment

Conflicts:
	AdvisingSchedulingApplication/target/m2e-wtp/web-resources/META-INF/maven/com.asa/asa/pom.properties