CAP-164 Fix log4j configuration
CAP-164 Fix log4j configuration
CAP-164 Fix log4j configuration
Merge remote-tracking branch 'origin/master' into CAP-164_UX_Overhaul_Bootstrap

Conflicts:
	pom.xml
CAP-180:  'Unparseable date' errors from Google -- update to ical4j v. 1.0.5.2 to fix regression with relaxed parsing
NOJIRA:  Correct javadoc, add helpful WARN logging when AuthN attributes are missing
NOJIRA:  Un-comment some adapter beans (caldav, exchange) and some user attributes they use to enable more features by default;  saves having to overlay more files when the portlet is bundled