Inserted link to bug tracker
Small comment correction
Merge commit 'caf4eb886e4c26975322b7163273561a324d0282'
Merge branch 'master' into bug-tracker

Conflicts:
	site/css/main.css