Safety
Import from file
Merge branch 'master' into todotxt

Conflicts:
	res/values/strings.xml
	src/com/luchenlabs/fantaskulous/JsonPersister.java
	src/com/luchenlabs/fantaskulous/TodoTxtPersister.java
	src/com/luchenlabs/fantaskulous/U.java
	src/com/luchenlabs/fantaskulous/model/ITaskList.java
	src/com/luchenlabs/fantaskulous/model/TaskList.java
	tst/com/luchenlabs/fantaskulous/test/EverythingTest.java
	tst/com/luchenlabs/fantaskulous/test/TaskTest.java
More todo.txt reading crap
80%, meaning 20%, of todo.txt support in place
Safety
Neurotic refactoring
Moar todo BS, untested even still
Merge branch 'master' into todotxt

Conflicts:
	res/values/strings.xml
	src/com/luchenlabs/fantaskulous/JsonPersister.java
	src/com/luchenlabs/fantaskulous/model/TaskList.java
Merge branch 'master' into todotxt
Merge branch 'master' into todotxt

Conflicts:
	res/values/strings.xml
Wooooo, dropbox dropbox dropbox
Test changing list name
Safety WIP for Dropbox updating sanely
Safety commit. Dropbox - Mostly stable
Use Core SDK--Dropbox works, woo
Merge branch 'master' into dropbox
More WIP
Fix wack priority flipping bug

Sorting was causing recycled views to point at stale models.
Merge branch 'master' into dropbox

Conflicts:
	README.md