adding listview on Aviewer to display next event
merging javascript files
Merge remote-tracking branch 'origin/master'

Conflicts:
	DigitalSignage/qml.qrc