Small change to page.html
Merge branch 'master' into laurel

Conflicts:
	src/biokbase/narrative/services/plants_gwas.py
Minor cleanup
Fixed error with quotes not being properly escaped.
Some cleanup.
Merge branch 'laurel' of http://github.com/kbase/narrative into laurel

Conflicts:
	src/biokbase/narrative/services/plants_gwas.py
	src/notebook/ipython_profiles/profile_narrative/kbase_templates/page.html
added link to JIRA for bugs
Added deeper error tracking code when something catastrophic occurs that doesn't get captured by the service.py error trapping code.
Merge branch 'master' of http://github.com/kbase/narrative
Improved catastrophic error code to catch the method that invoked it.
Merge branch 'master' into laurel