Trying to avoid locking
jsp added
some stuff merged
jsp skeleton added
maven added. Stupid sync evicted. comments removed
Fully assemblied by maven now
Merged from development
Logs returned back
packaging adjusted