Continue
Merge remote-tracking branch 'origin/master'

Conflicts:
	dotnetAvenue.WebUI/Scripts/app/directives/magazine3.html