Merge branch 'master' of root@202.112.159.251:Lv0

Conflicts:
	src/actions/Album.java
Merge branch 'master' of root@202.112.159.251:Lv0
1
tourlog
x
user
Merge branch 'master' of 202.112.159.251:Lv0
attentionDao
AttentionDao
fix flowview push new sql
Merge branch 'master' of 202.112.159.251:Lv0
fix some bug
friends
Merge branch 'master' of 202.112.159.251:Lv0
dao
Merge branch 'master' of 202.112.159.251:Lv0
attention
resort
Merge branch 'master' of root@202.112.159.251:Lv0
add follow