Monthly merge

Added logging tool
Router updated
Some new settings added
Many bugfixes