NOJIRA Fixed testing logging errors in overlay CAS server
NOJIRA Calendar to 2.1.3-M1 to use ical4j from maven central
NOJIRA Incorporated WeatherPortlet 1.0.10 for WPT-61, WPT-62
NOJIRA Fixed WeatherPortlet to include META-INF/context.xml
NOJIRA Change overlay pom to include META-INF/context.xml
NOJIRA Fixed overlay POMs for context.xml
to use consistent configuration for overlay handling of resources, added docs of how context.xml and resource filtering is handled
UP-3784
UP-3788:  uportal-maven-plugin does not properly copy MANIFEST.MF files within war files handled by deploy-ear
NOJIRA:  Sorry for the merge commit;  there appears to be some sort of conflict on assembly/quickstart/build.properties that won't allow me to rebase.

Merge branch 'master' of github.com:Jasig/uPortal