new timer usage, got hit by item
Merge branch 'state'

Conflicts:
	project/lib/libnios2rte-db_4ce10.a
	project/main.c