Kopirovani meho kodu
Merge remote-tracking branch 'origin/master'

Conflicts:
	default/src/model/generators/InstitutionGenerator.java
Kopirovani meho kodu
Kopirovani meho kodu