Fixed typo
Buffer clearing.
Merge branch 'master' into Development

Conflicts:
	src/menu.cpp
Merge branch 'Development'