Added note about line needing changes for heroku
Merge branch 'develop' into staging

Conflicts:
	proto.js