message list commit
message list commit
Merge remote-tracking branch 'origin/notification' into notification

Conflicts:
	AndroidManifest.xml
	res/raw/sqls.xml
	res/values/strings.xml
	res/values/styles.xml
	src/main/java/com/recruit/app/ui/main/MainActivity.java
	src/main/java/com/recruit/app/ui/main/SampleDatas.java