exclude log4j.properties from war; use /solr context path for tests; add velocity dep; rev 0.6.1
merged
Merge branch 'solr3' of git@github.com:msokolov/lux-appserver into solr3
added velocity dependency that was lost in merge