getting the build into the project
Merge branch 'master' of https://github.com/kiseido/PlanetSide-2-Useroptions-Editor

Conflicts:
	.gitignore