commiting gameactiviy
merge conflick resolved
confilct resolved
committing actionbar changes