NOJIRA:  Logging enhancements
[WPT-69] Update jquery version.
Merge pull request #26 from jhelmer-unicon/WPT-69_update_jquery

[WPT-69] Update jquery version.
NOJIRA deleted extraneous file tags/html/include.jsp
NOJIRA Added new look and feel using Bootstrap 3

Conflicts:
	src/main/webapp/WEB-INF/jsp/addAnnouncement.jsp
	src/main/webapp/WEB-INF/jsp/baseAdmin.jsp
	src/main/webapp/WEB-INF/jsp/displayFullAnnouncement.jsp
	src/main/webapp/WEB-INF/jsp/previewAnnouncement.jsp
	src/main/webapp/WEB-INF/jsp/showTopic.jsp
ANNPLT-94:  Adding a 'cancel' button to the Add/Edit Topic page
ANNPLT-94:  Remove several forced/unnatural windowState=normal & mode=view;  Add a few Candel buttons where they seemed needed;  Remove unused .js files
ANNPLT-94:  Configure the Maven lesscss plugin and rearange some directories according to convention;  Remove compiled .css files (they will be built)
ANNPLT-94 Add another Cancel button (this time to addAnnouncement.jsp)
ANNPLT-94:  Make cancel button on addAnnouncement send you 'back to topic'
NOJIRA Changed edit icon on show topic admin screen
NOJIRA Corrected issue with attachnments not displaying

Conflicts:
	src/main/webapp/css/announcements.css
ANNPLT-95:  Integrate the WYSIWYG editor on addAnnouncement.jsp with the Attachments portlet
NOJIRA:  Bump to 2.1.x for new UI reboot
NOJIRA:  Update the NOTICE file
NOJIRA:  Fix whitespace in license header of a JSP file
[maven-release-plugin] prepare release Announcements-2.1.0
[maven-release-plugin] prepare for next development iteration
ANNPLT-98:  Fix a few minor regressions from the recent UX reboot
Merge conflict