Merge pull request #16 from mkalkov/master

Thank you! I am happy to see that you identified a problem and even fixed it immediately! I can now close chms/jdotxt#15 and unit testing seems like a great idea. Thanks also for the build.xml cleanup ;)

As all of the code (apart from minor modifications) that handles the todo.txt files and datastructures came from the original Android app, I highly recommend that you also try to get your modifications into https://github.com/ginatrapani/todo.txt-android
OSX appbuilder lib included
Removed conflict resolution options
Fine tuned the autosave and the reload feature
Reload/Autosave bugfix
Merge pull request #1 from chms/master

Fetch upstream changes