Task #202: Added new features, changed views_vacations
Merge remote-tracking branch 'origin/202' into test