Update History.md
add waffle.io badge
Merge pull request #614 from waffleio/master

waffle.io Badge
Remove trailing whitespace
Add command line option support for Android
Add tests for InstrumentationArguments
Add support for 'count' option

This adds support to only count the number of scenarios by setting the
'count' argument to true.
Add support for 'debug' option

This adds support to wait for a debugger to attach at instrumentation
start. 'debug' can either be set to true or a number which represents the
timeout in milliseconds. Default timeout is 10 seconds.
Remove duplicate code for 'debug' option

'debug' support has been added through PR #613
Add support for 'coverage' option

This adds support to generate EMMA code coverage reports when using
CucumberInstrumentation. It is pretty much a 1:1 copy from
InstrumentationTestRunner.
Add support for 'log' option

This has the same effect as providing the Cucumber option '--dry-run'.
Move option parsing to InstrumentationArguments

This removes some code duplication in CucumberInstrumentation and
InstrumentationArguments.
Add tests for new argument options
ConvertersTest refactoring
Repeating parts have been factored out
TimeConverter used to use the SimpleDateFormat
The last one is [not thread safe](http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html#synchronization).
So, this commit returns a new SimpleDateFormat instance for every request.
Merge pull request #617 from cucumber/time-converter-simple-date-format-and-thread-safety

TimeConverter used to use the SimpleDateFormat
Removed some extra fields
Factored out one more field.
Merge pull request #616 from cucumber/converters-test-refactoring

ConvertersTest refactoring
Merge pull request #597 from friederbluemle/android-cmd-line-options

Add command line option support for Android