Updated to MC1.5.2
Updated to MC1.5.2
Merge branch 'master' into beta
Updated to MC1.5.2
Merge branch 'master' into beta
Merge branch 'master' into beta

Conflicts:
	src/com/friendsoverlay/fancygui/FancyGUI.java
Added support for GLSL Shaders
Changed version to 1.4