Complete pairing
Merge branch 'angular' of github.com:unregistered/nrt-webui into before_live

Conflicts:
	app/scripts/services/connection_parser.coffee