Added Core development
Merge branch 'ui' of https://github.com/wilsongregj/Diversion into ui

Conflicts:
	README.txt