a ton of stuff, report problem, change username, settings page
Merge remote-tracking branch 'origin/eric' into bala

Conflicts:
	ParseStarterProject/MyPlayground.playground/section-1.swift