deleted TestDatabaseActivity
deleted test xml file
Added editable column in database
Merge branch 'emil' of https://github.com/AkramKahin/Kartela into martin
added function for locking all rows in the database
Merge pull request #10 from AkramKahin/martin

Martin
added color to database. Its just there. Doesnt do anything so far
resolved conflicts