added the new bootstrap libs and updated references
colored bootstrap navbar
merged with developement
fixed some more bootstrap styling
fixed up more bootstrap stuff. Seems to look and work okay now
accidentally had changed bootstrap.js back to 2.0.2 switched back to 2.3.2. The dropdown bug persists
Added in hack to fix boostrap dropdown bug
fixed icons having strange background behind them
Merge remote-tracking branch 'origin/development' into bootstrap-latest
first working version of comment editing in the list view
removed log messages
moved editComment function to the Calendar app's App.js class, added javadoc to the two new API endpoints
Merge remote-tracking branch 'origin/bootstrap-latest' into bootstrap-latest
-prevented multiple comment edit dialogs from showing up
-added comment editting support to map and clock tabs
-added comment editing for location facets
-comment editing persists to the cache digest object
-fixed comment displaying on location facets
clicking on the comment edit button when it's open closes the editing
Merge remote-tracking branch 'origin/bootstrap-latest' into grapherCursor

Conflicts:
	fluxtream-core/src/main/java/com/fluxtream/services/MetadataService.java
	fluxtream-core/src/main/java/com/fluxtream/services/impl/ApiDataServiceImpl.java
	fluxtream-core/src/main/java/com/fluxtream/services/impl/MetadataServiceImpl.java
	fluxtream-web/src/main/webapp/css/connectors.css
	fluxtream-web/src/main/webapp/css/flx.css
	fluxtream-web/src/main/webapp/js/applications/calendar/App.js
	fluxtream-web/src/main/webapp/js/applications/calendar/facetTemplates.html
	fluxtream-web/src/main/webapp/js/applications/calendar/tabs/clock/ClockTab.js
	fluxtream-web/src/main/webapp/js/applications/calendar/tabs/list/ListTab.js
	fluxtream-web/src/main/webapp/js/applications/calendar/tabs/map/MapTab.js
	fluxtream-web/src/main/webapp/js/applications/calendar/tabs/map/MapUtils.js
	fluxtream-web/src/main/webapp/less/connectors.less

NOTE: comment editing on map tab is broken. Still needs more testing