Test 4
Test 6
Merge remote-tracking branch 'origin/master'

Conflicts:
	CHARMe_plugin/src/plugin/templates/footer.html