Resolved merge conflict

Makefile

client/main.js

common/config.js

common/db.js

common/isRunning.js

common/lkt.js

instance/index.ejs

instance/index.html

instance/main.js

instance/views/kara.ejs

instance/views/menubar.ejs

instance/views/menubar/buttons.ejs

instance/views/panels.ejs

instance/views/progressBar.ejs

instance/views/settings.ejs

instance/views/settings/checkBox.ejs

instance/views/settings/input.ejs

instance/views/settings/radioButtons.ejs

main.js

package.json