Type-oh
Merge pull request #177 from collinvandyck/patch-1

Type-oh
add EntityManagerFactoryInjectableProvider and supporting classes
added check on type
Type-oh Optional.absent()

putting the 'al' in Optional
Merge pull request #178 from littleidea/optional-type-oh

Type-oh Optional.absent()
Add missing word
Merge pull request #179 from chids/patch-1

Docs - Add missing word
Added configuration of base resource and protected targets on jetty
Merge remote-tracking branch 'origin/master' into Base-Resource

Conflicts:
	dropwizard-auth/pom.xml
	dropwizard-client/pom.xml
	dropwizard-core/pom.xml
	dropwizard-db/pom.xml
	dropwizard-scala_2.9.1/pom.xml
	dropwizard-testing/pom.xml
	dropwizard-views/pom.xml
	pom.xml
Reverted .gitignore change
Update jerkson dependency.
Added missing lines to apply protected targets :)
Updated FreemarkerViewRenderer to load the default Freemarker encoding map.
Merge pull request #182 from ajordens/master

Freemarker + Encoding Mappings
Merge pull request #181 from ieure/new_jerkson

Update jerkson dependency.
Revert "Merge pull request #181 from ieure/new_jerkson"

This reverts commit df3bda0511f745aea609d0c1cf2c51243ef73593, reversing
changes made to 6b5f2665e40f6fcb11c9fad9364a30e824e720fd.
Fixed issue with test failing on windows because of \r\n vs \n
Fixed issue with missing directories in assets broadcasting jar file path info.
SSL improvements to allow Windows key stores.