Updated grapher code to fix a crash with photo channels
added missing compiled grapher code
fluxtream capture photos now use thumbnails
Merge branch 'master' into dev

Conflicts:
	fluxtream-web/src/main/webapp/static/grapher4/332C04B2D0D1E6962BA6E8039C5E06CA.cache.html
	fluxtream-web/src/main/webapp/static/grapher4/386FA7E8D33853B4F56D3E3F8A011D8C.cache.html
	fluxtream-web/src/main/webapp/static/grapher4/4E247BD797907E5471EFCC4DB225A3CA.cache.html
	fluxtream-web/src/main/webapp/static/grapher4/4E4973179A7AD0C1BFFAFCC7C23E2643.cache.html
	fluxtream-web/src/main/webapp/static/grapher4/B764013827B0E50A825DB2D0C560373B.cache.html
	fluxtream-web/src/main/webapp/static/grapher4/E00D3DD7A2FF8A0EDCA6DC6B58748DDB.cache.html
	fluxtream-web/src/main/webapp/static/grapher4/grapher2.nocache.js