Changed next up event logic
Merge branch 'trunk' of github.com:SergeySukhanov/zeroProject into trunk

Conflicts:
	resources/css/zero.css
Merge branch 'trunk' of github.com:SergeySukhanov/zeroProject into trunk
weather style