only a test 3
将PersonalActivity改为PersonActivity，重构UI
修改gradle文件，编译SDK版本改为21
Merge remote-tracking branch 'origin/master' into rusk

Conflicts:
	app/src/main/java/com/diandi/adapter/FeedAdapter.java
	app/src/main/java/com/diandi/adapter/PersonalAdapter.java
	app/src/main/res/layout/item_feed.xml
synchronize to master-->1.2.1