Including modifications for building on OS X
Merge branch 'master' of github.com:Morpheu5/qtuiotouch

Conflicts:
	.gitignore