Add Kaji favicon
Improve docker file and change make file
Merge remote-tracking branch 'upstream/master'
Update from upstream for kaji and shinken-mod-influxdb submodules.

* Also update README for maintaining local changes to a submodule.