Vitaly's todos
Merge branch 'master' of https://github.com/eugene195/tp_2014_09_java
Minor changes
Merge branch 'master' of https://github.com/eugene195/tp_2014_09_java