Bump version
Squashed 'core/' changes from 8b7050b..53acb09

53acb09 Merge branch 'release/0.4.0-alpha'
bcfc429 Add release date
da2632c Update CHANGELOG.md
bf81cd1 Merge branch 'develop' of github.com:syncany/syncany into develop
4afcb66 Merge branch 'feature/issue313-daemon-add-multiple' into develop
adf012b Implements feature request #313
9468625 Update CHANGELOG.md
7e49d8d Merge branch 'feature/issue297-wizard' into develop
df00793 Fix inheritence issue
269a6ef Re-add InternalEvent
1d57f4a A bit of JavaDoc, introduction of EventResponse message class, relates to #297
417b2ff Add comments, a bit of formatting
0cbdf45 Bump version
3226f7a Throw IllegalArgumentException where necessary
3e99c62 Merge branch 'develop' into feature/issue297-wizard
2cf97cc Merge branch 'bugfix/issue316' into develop
2e61e7f Add tests to TestSuite
8fb5462 Add detailed test for #316 and fix it; fix to be discussed though.
c563ef7 Reproduce issue #316
10a69cd Merge branch 'feature/issue297-oauth' into feature/issue297-wizard
dde87e5 Remove obsolete double initialization
79ef98f Replace UserInteractionListener.onShowMessage with 'ShowMessageExternalEvent'
118bb55 Add correct error code
858f40e Add correct error code
d8d2088 Documenting RepoTOFactory
a665ed2 The actual factory itself
393bf9c Code deduplication: extract RepoTO creation to factory
884298e Make errorMessage in StorageTestResult not mandatory
744cca1 Workaround for SimpleXML bug, sensible error codes for Init/Connect via WS
c3fc159 Add folder icon resource for local plugin
b0350be Add GetPassword* messages for WebSocketUserInteractionListener
7a604b1 Merge branch 'develop' into feature/issue297-oauth
edc787d Merge branch 'develop' into feature/issue297-wizard
0e0b27d Fix Base58 code; throw illegal argument exception instead of RuntimeException
ec05d02 Allow TM.init() to alter the transfer settings (Flickr plugin needs this)
7b28ae2 Allow TM.init() to alter the transfer settings (Flickr plugin needs this)
6dd3297 Silence onShowMessage
bde59ff Merge branch 'develop' into feature/issue297-wizard
35c62a1 Make all TOs non-strict; for backwards compatibility.
fa3db04 Merge branch 'develop' into feature/issue297-wizard
6aaea0d Cont'd WebSocketUserInteractionListener: Now also works with 'connect'.
a3f6dcc Cont'd WebSocketUserInteractionListener
f4b1717 Cont'd websocket user interaction listener
30f0fed Javadoccing RemoteTransaction
683b13e Javadoccing CleanupOperation
0fb6ee1 Javadoccing DownOperation
e838514 Javadoccing UpOperation
8b515b0 Add fileType to local plugin
cb4ed48 Add fileType attribute in  annotation, relates to #297
cc6f6e6 Merge branch 'develop' into feature/issue297-wizard
8621851 Merge branch 'feature/issue297-oauth' into feature/issue297-wizard
46177b7 Cont'd working on OAuth stuff. Works well with Dropbox plugin
b896527 Add  annotation and add to CLI flow
d6fe1d9 Added workaround for 'connect' via GUI with syncany:// link, relates to #297
6c3a8ba A first shot at the WebSocketUserInteractionListener
4074da3 Patch transaction stats bug
b8aa466 Make CipherSpec default constructor (to allow serialization); relates to #297
0820c08 Added skeleton InitManagementRequest/Response, relates to #297
1586739 Fix tiny bug with 'resume' (encrypted TO file locally); rename local files to .xml
c72d5ed Resume in changelog
a09e7e5 Merge pull request #308 from syncany/feature/resume-transaction
d8c55d6 Merge branch 'develop' into feature/resume-transaction
ac48b8a Checking cache before resuming
9583691 Unencrypt local copies of transaction(-database)
8d7de87 Patch tests to not resume
b3ff42d Update README.md
4755119 Name shutdown hook thread, make 'resume' default in UpOperationOptions
03339d1 Alter --resume to --no-resume (make resume the default)
c71b51e Extracting parts of execute() to other methods
21f145b Merge branch 'feature/resume-transaction' of https://github.com/syncany/syncany into feature/resume-transaction
353ef63 Minor nitpicks
90f6e1d Switching to enums
595f4f7 Major nitpicks
d3a17c2 Resume fails test
58c7467 Merge branch 'develop' into feature/resume-transaction
14ce10d Merge branch 'feature/resume-transaction' of github.com:syncany/syncany into feature/resume-transaction
3b67d1a Merge branch 'develop' into feature/resume-transaction
804bfbb Update CHANGELOG.md
06204f9 Update CHANGELOG.md
ea948c8 Fixes #303
f4ed28f Merge branch 'develop' into bugfix/issue303-delete-moved-files
948cb60 Correct 'sy daemon*' output
f644b02 Documentation
fcd3ff8 Clean resumable transactions if no remote equivalent can be found
c60c96c Use shutdownhooks to enable resume after ctrl+c
38f2ba6 Including --resume in CLI
8287d3d Removing resumable transactions on down/cleanup
cf7ff86 Invert logic in finally-trap
e97f4d0 Deleting files if transaction is successfully resumed and committed
1f7b4f6 Merge branch 'develop' of github.com:syncany/syncany into develop
b41e22b Make OptionCallback/Converter non-static
c9461c2 Reproduce #303
1ff92b7 Update CHANGELOG.md
df8a0d5 Allowing commit to resume transactions
4e5fb3a Enabling resuming, only thing left is to handle it appropriately in commit()
8dcb1d0 Writing to persistent transaction file on failure of transaction
88b2748 Adding a status to ActionTO
d9aee31 Expose write of RemoteTransaction publicly

git-subtree-dir: core
git-subtree-split: 53acb0935a3c77f2e6bc46e59f3f5501eb626e0b
Merge commit '50513e2a527b4323dee62e8373733117bdc50339' into develop
Add icon for GUI