Initial commit
Merge branch 'develop' of https://github.com/alexvasiliev/tp_2014_02_java_Vasiliev into develop