- fixed incorrect variable naming
Merge branch 'master' of https://github.com/otavanopisto/muikku.git
Merge branch 'master' of https://github.com/otavanopisto/muikku.git
Merge branch 'master' of https://github.com/otavanopisto/muikku.git
Merge branch 'master' of https://github.com/otavanopisto/muikku.git
- localization refactoring
Merge branch 'master' of https://github.com/otavanopisto/muikku.git

Conflicts:
	muikku-core-plugins/src/main/java/fi/muikku/plugins/calendar/SubscribedCalendarUpdateScheduler.java