Merge remote-tracking branch 'origin/master'

* origin/master:
  saving changes
Merge remote-tracking branch 'origin/master'

* origin/master:
  fixed vars, refactored
  architecture compiles, starting ssh session implementation
building WAR ok