merge from qii.
update gitignore file
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49
Add swipe to close gesture to user info page
Merge from qii.
.gitignore file now should be working.
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49

Conflicts:
	.gitignore
	bin/weiciyuansnapshot.apk
Add swipe to close gesture to UserTimeLineActivity.
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49
Add Settings page to right fragments of sliding menu.
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49

Conflicts:
	src/org/qii/weiciyuan/ui/userinfo/UserInfoActivity.java
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49

Conflicts:
	.gitignore
Merge from origin/0.49.