Adaugari mici in pachetul model
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/muume/cockpit/model/UserPreferenceDTO.java