Add Academic Program flow.
Merge branch 'master' of github.com:mihaela1561/Resource-Management

Conflicts:
	RMS/src/Repository/RepositoryActivitiesPhase.java