Test
* Add test
Merge branch 'master' of https://github.com/khanhlb/DemoGetRss

Conflicts:
	Test.txt
test
* test
Merge branch 'develop'
aabcd
Merge branch 'master' into release_20140401
Merge branch 'master' into develop_new
change develop new