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

Conflicts:
	perceptum/settings.pyc
	perceptum/wsgi.pyc
Added tagline of perceptum
Merge branch 'master' into production
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
Added JumboTron below welcome image
Upgraded theme to bootstrap 2.3
Merge remote-tracking branch 'origin/master'
Removed pyc files
Added serving of pages
Merge branch 'master' into production
Updated menu and person titles
Merge branch 'master' into production