Restructuring modules to support testing both servlet and standalone during build
Adding test run to servlet project build, fixed issues found as a result
Updated dev version to 1.2-SNAPSHOT