add ooo
Merge branch 'hotfix/fix140630' into develop

Conflicts:
	sample.txt
Merge branch 'hotfix/fix140905' into develop

Conflicts:
	sample.txt