After register refactoring
Merge branch 'master' of https://github.com/eugene195/2014_Java_Technopark