Update theme
Merge branch 'master' into issue-977-mailchimp

Conflicts:
	pybossa/themes/default