13.05.2014 IVAN FINAL
Merge branch 'master' of https://github.com/ksan0/frontend
13.05.2014 IVAN FINAL