Merge remote-tracking branch 'origin/calendar' into development
Tests on separate js files
Merge remote-tracking branch 'origin/development' into calendar
Add show & hide methods + their tests;