Changes for conflict.
Merge branch 'development'

Conflicts:
	README.rdoc