Adding an IServiceFilter impl to handle busy state
Adding exception dialog.

Some file cleanup
Merge branch 'master' into CreateAndroid