blinkning
Merge branch 'dev' into dev_TR
blinks and shit