commit
Merge branch 'master' of https://github.com/CDargis/QitchenHub

Conflicts:
	KitchenApp.pro
	Resources.qrc
	languages/lang_pl.ts
	main.cpp
	qml/KitchenApp/AppGrid.qml
	qml/KitchenApp/AppInterface.qml
	qml/KitchenApp/FlickItem.qml
	qml/KitchenApp/HomeAutomation.qml
	qml/KitchenApp/HomeAutomationWidget.qml
	qml/KitchenApp/Kitchen.qml
	qml/KitchenApp/Lights.qml
	qml/KitchenApp/MusicApp/AddListItem.qml
	qml/KitchenApp/MusicApp/FlickableList.qml
	qml/KitchenApp/MusicApp/Music.js
	qml/KitchenApp/MusicApp/MusicPlayerWidget.qml
	qml/KitchenApp/MusicApp/MusicSettings.qml
	qml/KitchenApp/MusicApp/NowPlaying.qml
	qml/KitchenApp/MusicApp/PlayMenu.qml
	qml/KitchenApp/MusicPlayer.qml
	qml/KitchenApp/Organizer.qml
	qml/KitchenApp/Security.qml
	qml/KitchenApp/Settings/UserSettings.qml
	qml/KitchenApp/Social/Facebook.qml
	qml/KitchenApp/Social/Google.qml
	qml/KitchenApp/Social/Rss.qml
	qml/KitchenApp/Social/RssSettings.qml
	qml/KitchenApp/Social/SettingsDelegate.qml
	qml/KitchenApp/Social/Story.qml
	qml/KitchenApp/Social/Twitter.qml
	qml/KitchenApp/Social/TwitterContent.qml
	qml/KitchenApp/Social/TwitterFeedDelegate.qml
	qml/KitchenApp/Social/TwitterSettings.qml
	qml/KitchenApp/SocialFeed.qml
	qml/KitchenApp/Speaker.qml
	qml/KitchenApp/Temperature.qml
	qml/KitchenApp/Traffic.qml
	qml/KitchenApp/VirtualInput.qml
	qml/KitchenApp/VirtualKeyboard/VirtualKeyboard.qml
	qml/KitchenApp/Webs.qml
	qml/KitchenApp/WidgetInterface.qml
	qml/KitchenApp/kitchenWidget.qml
	qml/KitchenApp/main.qml
	qml/KitchenApp/weather.qml
	qtquick2applicationviewer/qtquick2applicationviewer.pri
	voice.cpp
	voice.h