Merge branch 'master' of https://github.com/FlagBg/Java2014