fiz ng-show top box
Merge branch 'julia' into testing

Conflicts:
	documents/css/company.css