Loads Economic Activities
Merge branch 'master' of https://github.com/vgeorge/elos

Conflicts:
	app/models/entity.js
	app/views/includes/header.jade