Fixing broken FileUploadServletRequest VIVO-222
Remvoing unused Solr fileds ALLTEXT_PHONETIC, PHI, ADJACENT_NODES, modType, JCLASS,
Adding field mostSpecificTypesURIs for VIVO-221
Add license tag line. Remove unused imports. VIVO-222
Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop
VIVO-39 Deprecate the SimplePermission instances that we would like to see go away.
VIVO-64 Modify UpdateKnowledgeBase so it doesn't require an empty directory.

It will create any directories that it needs. It will also store them in [vitro.home]/upgrade/knowledgeBase instead of [webapps]/vivo/WEB-INF/ontologies/upgrade
VIVO-234 Ignore a runtime.properties file in the distribution directory
VIVO-227 Remove warning message from JsonServletTest
VIVO-235 Reduce "deprecation" messages in the build

The benefit of making these instances deprecated is very small. The annoyance of having deprecation messages in the build is very real.
VIVO-235 Reduce "deprecation" messages in the build

It's OK for these stub classes to implement deprecated methods in the interfaces, as long as they declare those methods with @Override and @Deprecated.
VIVO-235 Reduce "deprecation" messages in the build

The @SuppressWarnings("deprecation") annotation doesn't apply to an import statement, but it does apply if the class is fully-qualified when created.
VIVO-235 Improve build instructions.

Tell the user what to expect when they run "ant all", and how to distinguish success from failure.
Removing PageDataGetters and its related servlets and tests. VIVO-218
VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
VIVO-96 Recognize language support within editing framework.

Instead of adding the same kluge in another location (and passing the necessary info through six layers of framework), modify the FreemarkerConfiguration to directly hold request info. Storing it in a ThreadLocal means that each thread sees its own request info, without confusion. There is still only one instance of FreemarkerConfiguration, so the template cache is shared as before.
VIVO-246 Set up the Freemarker directives in only one place.
VIVO-246 Continue cleanup
Merge remote-tracking branch 'origin/develop' into dev-isf

Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/MultipartHttpServletRequest.java