Adds wait for activity to prevent IndexOoB
Merge index out of bounds into master
Reverts whitespace
Merge pull request #136 from novoda/gradle-master

Fixes Index Out of Bounds