Merge branch 'master' of https://github.com/tjt7a/GR-Router

Conflicts:
	apps/transparent.cc
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router
Merge branch 'master' of https://github.com/tjt7a/GR-Router