10:04
Merge branch 'master' of https://github.com/Stefterv/Aesthetic-Journalism

Conflicts:
	portal.php