Active URLs removed, function replaced by labels.
Merge branch '(1.1)'

* (1.1):
  Active URLs removed, function replaced by labels.

Conflicts:
	BDPoint/BDAuthenticationViewController.m