More comments, commiting to merge
Merge remote-tracking branch 'origin/master'
Updated comments and added @Override to methods
Removed bug from search screen
Merge remote-tracking branch 'origin/master'