Commiting all the changes from previous s02-u40 branch to the new dev
subbranch
us40 - Integrated tag search layout into main activity
Ignored some files
Merged to dev
Merge remote-tracking branch 'origin/s02-u40-dev' into dev-local
Conflicts: res/drawable-hdpi/button_selector.xml
solved conflicts when pulling