- ng-clone-cat
Merge origin/master

Conflicts:
	partials/templates/locale/1.html
Merge origin/master

Conflicts:
	partials/templates/locale/1.html