hidden "trotters advice" text
Added
fixed flow when a new user is created to about asking for preferences 3 times
Merge remote-tracking branch 'origin/development_bugfixing' into development

Conflicts:
	web/app/components/getstarted/getstarted.html
	web/app/components/shortlist/shortlist.html