Fixed mess of view vs viewId vs gaView

Now foreign keys to internal document ids are ‘viewID’
External references to GA view number is still gaView
Merge branch 'master'

Conflicts:
	server/ga.js