cocks in right position, timer changed, fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	CockBlock8.1/CockBlock8.1/CockBlock8.1.Shared/ViewModel/CB_ViewModel.cs