Simple Paragraph Aligner
SimpleParagraphAlignerStep
Added missing file.
Fixed batchTmLeveraging for empty entries (issue 331)
Merge branch 'dev' of https://code.google.com/p/okapi into dev
Merge branch 'dev' into html5
Updated changes log.
Turned on SimpleSentenceAlignerStep in PipelineWrapper
Merge branch 'dev' of https://code.google.com/p/okapi into dev
Fixed Rainbow integration with SimpleSentenceAlignerStep; updated changes log.
For merging
Merge branch 'dev' of https://code.google.com/p/okapi into dev

Conflicts:
	okapi/steps/aligner/src/main/java/net/sf/okapi/steps/paraaligner/SimpleParagraphAlignerStep.java
Bring tikal.sh for OS X in line with other platforms

    This lets you run tikal from another directory.
Fixed Descriptor null bug.
Merge branch 'dev' of https://code.google.com/p/okapi into dev
Fixed illegal argument exception.
No change
ITS: Fixed Provenance inheritance with attributes; updated test suite.
Merge branch 'dev' of https://code.google.com/p/okapi into dev
Fixed LQI extensions output.