Merging
Merge branch 'master' of https://github.com/PerceptumNL/PerceptumWebsite

Conflicts:
	perceptum/settings.pyc
	perceptum/wsgi.pyc
Merge branch 'master' of https://github.com/PerceptumNL/PerceptumWebsite

Conflicts:
	frontend/__init__.pyc
	frontend/admin.pyc
	frontend/models.pyc
	frontend/urls.pyc
	frontend/views.pyc
	perceptum/__init__.pyc
	perceptum/urls.pyc
Changed content on front page