Updating merge fail from Development branch
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	js/asd-1310-jQuery.js
Updating merge fail from Development branch