rebase issues
Merge branch 'master' of https://github.com/stevenRush/fizteh-java-2013