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

Conflicts:
	Test.txt
* test
Merge branch 'develop'
Merge branch 'master' into release_20140401