add libraries
changes
local commit
Merge branch 'master' of https://github.com/rawiry/Station-terminal.git

Conflicts:
	com.hlubocky.benzina.terminal/src/com/hlubocky/benzina/bean/User.java
	com.hlubocky.benzina.terminal/src/com/hlubocky/benzina/component/SmartLong.java
	com.hlubocky.benzina.terminal/src/com/hlubocky/benzina/terminal/frame/PassWordDialog.java
	com.hlubocky.benzina.terminal/src/com/hlubocky/benzina/terminal/frame/TerminalFrame.java