+ RAWCAN SocketCAN support
* russian translation fixed
Merge branch 'master' into kium

Conflicts:
	src/moduls/transport/Sockets/po/ru.po
	src/moduls/transport/Sockets/socket.cpp
	src/moduls/transport/Sockets/socket.h
Merge branch 'master' into kium
2014-11-30 Roman
- !:UI.VCAEngine: Inheritance support is added for owner and permition of the widgets.



git-svn-id: svn://oscada.org/trunk/OpenSCADA@2175 7bc60720-51fb-0310-bb35-cf765b5d350c
Merge remote-tracking branch 'origin/git-svn'
Merge branch 'kium'