stop inlining evernote notes in the tooltips/list view and have them displayed in a separate popup for reading
fixed Jawbone UP filter in the photos tab
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	fluxtream-web/src/main/webapp/js/applications/calendar/App.js