added postgis module
ensure default optional imports are only added if applicable
updated spring module, added wicket module