Adds  some binary files
Merge remote-tracking branch 'origin/cristi'

Conflicts:
	.idea/workspace.xml
	gui/qt_mainwindow.pyc
	gui/qt_serverdock.pyc
	robots/quickbot.pyc
	scripts/sensor.pyc
	scripts/server/sim_server.pyc
	scripts/server/sim_server_helpers.pyc
	scripts/simulator.pyc
C1
Merge remote-tracking branch 'origin/cristi'

Conflicts:
	.idea/workspace.xml
	gui/qt_mainwindow.pyc
	gui/qt_serverdock.pyc
	robots/drk8080.pyc
	robots/i90.pyc
	robots/quickbot.pyc
	robots/x80.pyc
	robots/x80h.pyc
	scripts/sensor.pyc
	scripts/server/sim_server.pyc
	scripts/server/sim_server_helpers.pyc
	scripts/simulator.pyc
Merge remote-tracking branch 'origin/cristi'

Conflicts:
	.idea/workspace.xml
	gui/qt_mainwindow.pyc
	gui/qt_serverdock.py
	gui/qt_serverdock.pyc
Merge branch 'cristi'

Conflicts:
	gui/qt_mainwindow.py
	gui/qt_pcmain.py
Untrack files from .idea folder
Merge branch 'cristi'
Merge branch 'cristi'