migrated to column-major order
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/build.scala
removed javadoc html