Fixed properties
Merge branch 'master' of https://github.com/Filutkie/iBox-Terminals

Conflicts:
	.gitignore