.
Merge branch 'dev' of github.com:kevin-jomedia/test into dev

Conflicts:
	index.php