..?
Merge remote-tracking branch 'origin/master'

Conflicts:
	ICT4Events Project/ICT4Events Project.v12.suo