hotfix_20140127
Merge branch 'develop' of https://github.com/matchingood/demo into hotfix_20140127

Conflicts:
	demo.txt