small changes on public and private area css
Merge branch 'master' of https://github.com/wellincall/project-happiness

Conflicts:
	project_happiness/templates/public_area/survey.html
Merge branch 'master' of https://github.com/wellincall/project-happiness

Conflicts:
	project_happiness/static/css/public_area/base_public.css