simplify rules
Merge branch 'fix/timezone' of github.com:johanpoirier/z-home into fix/timezone

Conflicts:
	app/rules.js