2014/12/02 0951 mura
2014/1202 0953 mura
Merge branch 'bbb' into aaa

Conflicts:
	bin/TwitterClient.apk
	bin/classes/ncs2014/s06/twitterclient/Twitter_home.class
	bin/classes/ncs2014/s06/twitterclient/Twitter_user.class
	bin/resources.ap_
	res/layout/twitter_home.xml
	src/ncs2014/s06/twitterclient/Twitter_home.java
2014/12/02 1100 マージ
2014/12/02 1101 マージ
2014/12/02 1107 mura