added text areas for descriptions
added not to self
Merge branch 'master' into Colin-Dev

Conflicts:
	src/Launcher.java
makeing merge fixes