#36 updated to GB 1.4-SNAPSHOT, fixed compilation problems, and refactoring of application module
#36 fixed some conflicts