Updated sparql queries to use mostSpecific type and new role
relationships. Switched to connecting to the union graph instead of kb-2
+ vivo core ontology
Update queries to use union graph and most-specific type

Take advantage of most-specific type inference to simply sparql. Query
against union graph to avoid loading the ontology model separately. Make
return types of jena functions parameterized.
Update README for new listener configuration instructions
Update styles, add basic theming

Add config option 'Widgets.theme'. This will load main.css, header.png
and logo.png from webapp/vw/themes/{theme} directory.
Add *deploy.properties to gitignore
Add Organizatin Indexing
Organization Indexing
Indexing updates - add sort to people and grants / fix cache clear
FDP-1374 Upgrade scalatra

Initial upgrade of scalatra. Still work to be done.
FDP-1374 Use connection pool and cache templates

Update to use a c3p0 connection pool and cache the templates.
FDP-1344 advance link open in new window

For advance links, open those in a new window.
FDP-1345 Fix copy to clipboard

Fix the copy to clipboard swf that wasn't getting loaded when the
context was under /widgets.
FDP-1343 Fix for more info URL

More info URL can be corrected based on the environment.
FDP-1343 refactor url replacement

URL replacement for the more info links only happens if it is defined
in the deploy.properties file. It is no longer dependent on the
default protocol and domain being set in deploy.properties.
FDP-1374 Make resources available in Jar

- Move webapp directory under resources to make them available to the
  jar file.

- Made jetty look inside of jar file for resources.

- Name of jar file is vivo-widgets.jar
Merge branch 'scalatra_upgrade_of_master'
FDP-1343 Cleanup logging, add max threads and db pool idle time

Cleaned up logging and extra code.
Added max thread size to jetty startup (defaults to 100).
Set the max idle time ad max age for db connection pool.
FDP-1343 Update logback

Updated logback
FDP-1346 Refactor person indexing

Move sqarql queries and indexing to the individual objects.
Updated to scala 2.10.1 (point release).

Conflicts:

	src/main/resources/webapp/WEB-INF/scalate/templates/builder/person.jade
FDP-1346 cleanup for indexing

Cleaned up extra commits and using of template generator.