pre sync
merge resolution

Conflicts:
	assets/src/app/more/contributors/index.tpl.html