view, url, test, css, templates commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	cross_founding_platform/cross_founding/forms.py
	cross_founding_platform/cross_founding/views.py
	cross_founding_platform/urls.py
	templates/css/bootstrap.css
commit settings