J: EditProfileActivity updated and prepped
Merge branch 'master' of https://github.com/mkoba/Tinasaurus