fs
Merge branch 'master' of https://github.com/NUKnightLab/fao-explorer

Conflicts:
	app/static/js/fao-explorer.js
Merge branch 'master' of https://github.com/NUKnightLab/fao-explorer
hh
Merge branch 'master' of https://github.com/NUKnightLab/fao-explorer

Conflicts:
	app/js/fao-explorer.js