Remove unnecessary keep file
Components page
Component controller method
Quick update to the staff page
Merge branch 'master' of https://github.com/indesys/Nexus

Conflicts:
	public/assets/css/main.css