pica spa working with hard token
Merge branch 'develop' into alan

Conflicts:
	WebApplication1/WebApplication1.v12.suo
	WebApplication1/WebApplication1/WebApplication1.csproj
	WebApplication1/WebApplication1/app/Views/list.html
	WebApplication1/WebApplication1/app/app.js
	WebApplication1/WebApplication1/app/controllers/search.js
	WebApplication1/WebApplication1/bin/System.Net.Http.Formatting.xml
	WebApplication1/WebApplication1/bin/System.Web.Http.WebHost.xml
	WebApplication1/WebApplication1/bin/System.Web.Http.xml
	WebApplication1/WebApplication1/bin/WebApplication1.dll
	WebApplication1/WebApplication1/bin/WebApplication1.pdb
	WebApplication1/WebApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WebApplication1/WebApplication1/obj/Debug/WebApplication1.csproj.FileListAbsolute.txt
	WebApplication1/WebApplication1/obj/Debug/WebApplication1.dll
	WebApplication1/WebApplication1/obj/Debug/WebApplication1.pdb
no message
merged and everything appears to be working. data access is SLOW, needs bulk calls. Timestamp and Value load independently