Maybe now it works
Merge branch 'master' of https://github.com/CampusTools/LWAR

Conflicts:
	LWAR/LWAR.Designer.vb
	LWAR/LWAR.vb