Merge branch 'master' of https://github.com/dfsq/ngView-animation-effects

Conflicts:
	.gitignore