Changed some textbox and input stuff.
Merge branch 'master' of github.com:fourstarmon/fourstarmon

Conflicts:
	.gitmodules