resolve conflicts
more work on revert and resolve conflicts
add more error checking on launch; improve the application's logging
finish todos
finish up the UI; leave TODOs for the scm implementations
Merge pull request #1090 from devoncarew/devoncarew_error_checking

Devoncarew error checking
Merge pull request #1082 from devoncarew/devoncarew_resolve_conflicts

Devoncarew resolve conflicts
spark_split_view css
comment a issue number
apply unittest package 0.10.0
expectAsync1 to expectAsync
Merge pull request #1095 from sunglim/unittest_fix

Fix error against unittest package 0.10.0
pubspec and nits
Merge branch 'master' into devoncarew_pubspec_updates
Merge pull request #1098 from devoncarew/devoncarew_pubspec_updates

Devoncarew pubspec updates
Merge pull request #1094 from sunglim/split_view

spark-split-view: Correct styling.
fix nit in spark.dart
Merge pull request #1100 from devoncarew/devoncarew_nit

fix nit in spark.dart
remove the close action
Merge pull request #1103 from devoncarew/devoncarew_remove_close

remove the close action