cleanup
Merge branch 'master' of https://github.com/kylejao/ocean_framework

Conflicts:
	ocean/tests/data/.svn/all-wcprops
	ocean/tests/data/.svn/entries
	ocean/tests/data/.svn/text-base/test_1.svn-base
	ocean/tests/data/.svn/text-base/test_15.svn-base
	ocean/tests/data/.svn/text-base/test_16.svn-base
	ocean/tests/data/.svn/text-base/test_17.svn-base
	ocean/tests/data/.svn/text-base/test_2.svn-base
	ocean/tests/data/.svn/text-base/test_50.svn-base
	ocean/tests/data/.svn/text-base/test_500.svn-base
	ocean/tests/data/.svn/text-base/test_6_2.svn-base