CanCan Update
Fixed a bug preventing a document from being read when a project is
public.

Signed-off-by: shanesuofi <shanes@vandals.uidaho.edu>
Search now using ES pagination, but no data merging for now. Also stubbing demo
adding demo data and first part of demo
downgrading less-rails away from some bugs
Updating the demo for search
Merge branch 'master' of github.com:cblair/portal
Merging working, except pagination numbers are wrong (I think)
doc saves from search merges working
merged in integration
fixing numbering for merge search
updating demo page
Adding printing of search time
taking out more merge stuff from main search
Merge branch 'master' of github.com:cblair/portal
adding search alerts after search takes too long
fixing/updating Save As from merge search
removed URI escape in ES helper; still have some sort of escaping to do
Document helper bug fix.
Fixed a bug that would delete the first data line when using the internal
CSV filter.

Signed-off-by: shanesuofi <shanes@vandals.uidaho.edu>
Document helper CSV bug fix.
Fixed a bug that would delete the first data line when using the internal
CSV filter.

Signed-off-by: shanesuofi <shanes@vandals.uidaho.edu>
Merge Metaforms into integration.

Signed-off-by: shanesuofi <shanes@vandals.uidaho.edu>