кеширование шаблона
Merge branch 'master' of https://github.com/abaddonGIT/angularInfinityScroll

Conflicts:
	js/scroll/scroll.js