Add syntax highlighting for @ and # signs

Fix #1001445

Conflicts:
	CHANGELOG