Merge origin/master

Conflicts:
	index.php
	nbproject/project.properties
Merge origin/master

Conflicts:
	css/signin.css
	includes/checkLogin.php
	includes/header.php
	includes/login.php
	index.php
	php/addSpeler.php
	php/addVereniging.php
	php/home.php