Media calculator with bug
average calculator with bug
merged + average calculator (with a little bug)

Conflicts:
	SwingClientNew/src/edu/ubbcluj/academicinfo/frontend/res/Messages.properties
	SwingClientNew/src/edu/ubbcluj/academicinfo/frontend/res/Messages_hu.properties
	SwingClientNew/src/edu/ubbcluj/academicinfo/frontend/res/Messages_ro.properties