Merge branch 'master' of http://github.com/keepinggiant/Painted-Wood

Conflicts:
	paintedwood/PaintedWoodCore.java
Merge branch 'master' of http://github.com/keepinggiant/Painted-Wood