logic adding. sidebar displays area name
Merge branch 'master' of https://github.com/Highvolt/FEUPdemic

Conflicts:
	console.log