Merge remote-tracking branch 'refs/remotes/remote/master'

Conflicts:
	ShootR/ShootR/controller.aspx
	ShootR/ShootR/default.aspx
	ShootR/ShootR/packages.config