Fixed renaming
refactored a bunch of stuff
added another query to SampleDatabase - move all queries to new class?
DB in EditActivity doesnt have any data.

Major:
Editactivity is still out of order
upload doesn't work
Occasional crashes, error loading sample 1.