More work on being able to pick up/ drop a key
Merged XML firstscreen
Merge branch 'developer' of https://github.com/AndroidSquad/Coloristance into developer