Adding in profile link to base.html
Adding in edit profile form and functionality
Merge branch 'master' into frontend
Merging two style sheets, adding in new homepage html
Added status to Computation
added ajax view for zoo to update a computation's status
Add check to see if objects exists in ajax functions.
Added status to computation templates.
Updated ajax view for computation status. it now takes rsa-encrypted strings
Changed name of DataFile field 'metadata' to more descriptively accurate 'variables'.
Making sure all exceptions are handled and just a simple 'failure' message is printed
Merge pull request #10 from Calvin-Liono/master

Adding usability feature
Merge branch 'climateanalyser'
Merge branch 'master' of https://github.com/climate-analyser-team/bom-frontend
Fixed up code style to only use 80 chars/line

Also ensured consistent 3-space tabs.
Merge remote branch 'upstream/master' into 80chars

Conflicts:
	climateanalyser/admin.py
	climateanalyser/urls.py
	static/climateanalyser/js/computationdataform.js
	zooadapter/models.py
Merge pull request #12 from Andrew-Dunn/80chars

Fixed up code to only use 80 chars/line
Added new database dump
Styling login page, profile page updates and footer updates
Merge branch 'master' into frontend

Conflicts:
	auth/urls.py
	auth/views.py
	templates/base.html