아이콘 변경
Merge branch 'master' of https://github.com/Nexters/WeStudy

Conflicts:
	westudy/app/src/main/java/com/common/NavigationDrawerFragment.java
	westudy/app/src/main/res/drawable-xhdpi/btn_trans.png