Merge branch 'master' of https://github.com/johnnygao/IconArrStudie

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge remote-tracking branch 'origin/master'

Conflicts:
	IconArrStudie/src/main/res/layout/activity_test1.xml