x

x
Merge branch 'master' of https://github.com/moctis/EveBot

Conflicts:
	EveWeb/Views/Shared/_LayoutAngular.cshtml
conflict