Creating comments added
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/account/profile.html
	public/app/products/product-details.html
	server/config/routes.js
	server/controllers/productsController.js
	server/views/includes/scripts.jade