random or by-vote, connection
Merge branch 'master' of https://github.com/cicer1/bbtide

Conflicts:
	Resources/css/style.css
	Resources/js/main.js
	Resources/js/views/startView.js
	Resources/python/synch.py
	Resources/templates/directory.html
	dist/linux/HelloWorld/Resources/css/style.css
	dist/linux/HelloWorld/Resources/js/main.js
	dist/linux/HelloWorld/Resources/js/views/startView.js
	dist/linux/HelloWorld/Resources/python/synch.py
	dist/linux/HelloWorld/Resources/templates/directory.html