2014-10-28

Conflicts:
	src/desc.txt