updating coutner acitivites
updating coutner layouts to match their activities expectations
Merge branch 'master' of https://github.com/GrinnellAppDev/GrinWell-Android
This merge was necessary for development to continue.