Update 15/05/13
Merge branch 'master' of https://github.com/megasus/Namcore-Studio

Conflicts:
	Namcore Studio/Framework/Constants/GlobalVariables.vb
	Namcore Studio/obj/x86/Debug/Namcore Studio.exe
	Namcore Studio/obj/x86/Debug/Namcore Studio.pdb