slight update
Merge branch 'master' of https://github.com/element4git/pluggedin

Conflicts:
	css/global.css
	css/global.scss
	index.php