edit activity
touched edit layout
Crashes fixed
Merge branch 'master' of https://github.com/grammaright/ShowMeTheMoney