Updated macros, added reboot notifier
Merge branch 'development'