Init
Merge remote-tracking branch 'origin/master'

Conflicts:
	ContentItem.qml
	MyListItem.qml
	PageServices.qml
	README.md
	SideMenu.qml
	SideMenuItem.qml
	TitleBox.qml
	deployment.pri
	main.cpp
	main.qml
	qBonJour.pro
	qBonJour.pro.user
	qBonJour.pro.user.d754a5d
	qml.qrc