Adjusting indentation
Merge branch 'master' of github.com:raphaelpaiva/JTrace

Conflicts:
	src/action/org/jtrace/shader/SpecularShader.java
Merge branch 'master' of github.com:raphaelpaiva/JTrace
Removing warnings

* Unused imports in PlyReader
* @Override annotations on MultiThreadTracer and AmbientShader