To issue #261 not finished, packaages updated
merge conflicts in TestWrapper.csproj were resolved
upstream changes were added
Merge branch 'merge' into development

Conflicts:
	AjourBT/Content/Site.css
	AjourBT/Controllers/CalendarController.cs
	AjourBT/Controllers/HomeController.cs
merge with upsteream 16.09
Site.css. HomeController were changed
Merge pull request #329 from AnnaStorozhenko/development

Merge upstream 16.09