(tnoodle) Merging in changes from gnehzr. I have no idea if this is going to preserve his commit history.
(tnoodle) Modified lint.py to care about indentation of java files. Also converted all tabs in java files to 4 spaces.
(tnoodle) Removed tabs & modified lint to not allow any new ones.
Merge branch 'master' of github.com:cubing/sq12phase into sq12phase

Conflicts:
	FullCube.java
	Search.java
	Shape.java
	Square.java