ComparisonSearchActivity

Implemented the new comparison search activity, and connected it to the
profile activity. The layout still needs to be adjusted, but the profile
and search code is already there.
MergeConflicts sorted again

Merge conflicts from the android manifest fixed again.
Fix Android Manifest.