Code clean-up
Merge branch 'master' into activity-poc-agg2

Conflicts:
	node_modules/oae-principals/lib/api.picture.js