hotfix1
Merge branch 'release' of https://github.com/matchingood/demo into hotfix_20140207

Conflicts:
	demo.txt
Merge branch 'develop' of https://github.com/matchingood/demo into hotfix_20140207