sync
Merge branch 'master' of github.com:CDargis/QitchenHub
Merge branch 'master' of github.com:CDargis/QitchenHub
Merge branch 'master' of github.com:CDargis/QitchenHub
sync
Merge branch 'master' of github.com:CDargis/QitchenHub
added changes
Merge branch 'master' of github.com:CDargis/QitchenHub

Conflicts:
	Resources.qrc
changed the property index to appIndex that Tom changed inside of AppInterface