author for each comment create
author made for each comment
Merge branch 'master' into bala

Conflicts:
	ParseStarterProject/Main.storyboard
Merge remote-tracking branch 'origin/master' into eric