hotfix2
Merge branch 'release' of https://github.com/matchingood/demo into hotfix_20140208

Conflicts:
	demo.txt