Removed TickBase and TickHandler
Some other modifications I can't remember right this moment
Fixed conflicts
Merge branch 'lego-dev'