Signed-off-by: trishul goel <trishul.goel@gmail.com>
Merge remote-tracking branch 'upstream/master'

Conflicts:
	manifest.webapp