modify position of loginButtons
Merge branch 'master' of https://github.com/Ermlab/Silos

Conflicts:
	client/views/includes/header.html~