Fixed Bug causing 2 searchActivities to launch
Merge pull request #65 from cyrieu/master

Fixed Bug causing 2 searchActivities to launch
Merge pull request #66 from AnimaSA/master

Merge commits to working