in the middle of... something... before new LinksVO
Merge branch 'beta' into leif6

Conflicts:
	Jarvizz/Jarvizz/Controller/ConfigurationController.cs
extended config file