added annotations view
Merge branch 'master' of https://github.com/baliga-lab/network_portal

Conflicts:
	web_app/networks/templates/bicluster.html
	web_app/networks/views.py